TMS_STM_Peripher/UKSS_23550_2
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлена автокалибровка

Browse Source
This commit is contained in:
Dimas
2025-10-23 15:21:59 +03:00
parent a9c42feb81
commit 3f5e355783
10 changed files with 775 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Internal/ADC.c
+9 -10
View File
@@ -56,9 +56,9 @@ void setup_adc()
if(Desk==dsk_COMM)
{
AdcRegs.ADCMAXCONV.bit.MAX_CONV1 = 0x0001; // Setup 2 conv's on SEQ1
AdcRegs.ADCCHSELSEQ1.bit.CONV00 = 0x5; // ñíà÷àëà òîæå áóäóò òåìïåðàòóðû
AdcRegs.ADCCHSELSEQ1.bit.CONV00 = 0x5; // ������� ���� ����� �����������
AdcRegs.ADCCHSELSEQ1.bit.CONV01 = 0x4; // Setup ADCINA2 as 2nd SEQ1 conv.
/* À íàïðàæåíèé íàì òóò è íå íàäî
/* � ���������� ��� ��� � �� ����
AdcRegs.ADCCHSELSEQ1.bit.CONV02 = 0x7; // Setup ADCINA2 as 2nd SEQ1 conv.
AdcRegs.ADCCHSELSEQ1.bit.CONV03 = 0x2; // Setup ADCINA2 as 2nd SEQ1 conv.
AdcRegs.ADCCHSELSEQ2.bit.CONV04 = 0x3; // Setup ADCINA2 as 2nd SEQ1 conv.
@@ -163,7 +163,7 @@ interrupt void adc_isr(void)
if(TermoAD)
{
if(cownt_cans == TPL_CANS ) code_tpl_canal = TERMOPAIR-1;
if(cownt_cans == TPL_CANS+1) code_tpl_canal = TERMOPAIR-2; // ïîòîìó ÷òî 300 è 400 íàîáîðîò
if(cownt_cans == TPL_CANS+1) code_tpl_canal = TERMOPAIR-2; // ������ ��� 300 � 400 ��������
}
select_tpl_canal(code_tpl_canal);
}
@@ -181,12 +181,11 @@ interrupt void adc_isr(void)
if(ok|!prev_ok[n])
{
if(WAKE) ADC_table[n] = Temper;
else
{
Filter = filterbat(&adc_filter[n],Temper);
ADC_table[n] = Filter;
} } }
Filter = filterbat(&adc_filter[n],Temper);
if(WAKE)ADC_table[n] = Temper;
else ADC_table[n] = Filter;
} }
if(++cownt_one_canal>=COUNT_ONE_CANAL)
{ cownt_one_canal=0;
@@ -214,7 +213,7 @@ modbus[0x2F]=Log.Adres;
{
cownt_cans = 0;
Test_mem_limit(TermoSW*(TPL_CANS+2));
Test_mem_limit(2*TermoSW*(TPL_CANS+1));
if(cWriteLog)no_write=1;
} }