Лампа "высокое" управляется по CAN

This commit is contained in:
2025-08-04 17:29:00 +03:00
parent 111ec362b4
commit ca3ffe0d98
13 changed files with 1013 additions and 957 deletions

View File

@@ -31,7 +31,7 @@ FILTERBAT adc_filter[ADC_MAX];
float out_filter[ADC_MAX];
unsigned int CanPowse=CANPOWSE,CanGO=0;
unsigned int Caliber_time=0;
unsigned long Caliber_time=0;
int GOOD[0x10];
int ZERO[0x10];
@@ -91,10 +91,9 @@ interrupt void cpu_timer1_isr_SENS()
}
if(!TST)
if(count_bright == Brightness)
{
clear_LED_OUT_2();
clear_LED_OUT_1();
if(count_bright == Bright[0]) clear_LED_OUT_1();
if(count_bright == Bright[1]) clear_LED_OUT_2();
}
if(TST & !preTest)
@@ -116,11 +115,21 @@ interrupt void cpu_timer1_isr_SENS()
work_lamp = blink_over;
}
else
if(cLiteFire)
{
if(sig.bit.Error) work_lamp = blink_over;
else work_lamp = 1;
heat_lamp = 1;
work_lamp = 1;
}
else
{
if(Desk==dsk_BKSD)
{
if(sig.bit.Error) work_lamp = blink_over;
else work_lamp = 1;
if(bSecretBt|cSecretBt) work_lamp = blink_alarm;
if(bSecretBt|cSecretBt) work_lamp = blink_alarm;
}
else work_lamp = cHighVolt;
if(sig.bit.OverHeat) heat_lamp = 1;
else if(sig.bit.SubHeat) heat_lamp = blink_over;
@@ -150,7 +159,10 @@ void Init_sensors()
}
for(i=0;i<ADC_MAX;i++)
{
adc_filter[i] = def_FILTERBAT;
out_filter[i] = 0;
}
if(Desk==dsk_COMM)
{
@@ -172,8 +184,6 @@ void Init_sensors()
MesPerSec = MesPerSec*3/cans; // òèïà, òðè ñåêóíäû
}
void Init_packMask()
{
int i,j;
@@ -203,7 +213,7 @@ void Init_packMask()
for(i=0;i<3; i++)
Maska[m_SLOW][i+3] = Maska[m_FAST][i]; // Óñòàâêè
Maska[m_SLOW][6]|=0x0100; // ßðêîñòü ëàìï
Maska[m_SLOW][6]|=0x0300; // ßðêîñòü 2 ëàìï
if(Desk == dsk_BKSD)
Maska[m_SLOW][7]|=0x0003; // Êàëèáð òåðìîäàò÷èêîâ
@@ -222,9 +232,9 @@ void Init_packMask()
} }
Maska[m_FAST][1]|= 0x0003; // Äèñêðåòíûå kíîïêè
Maska[m_SLOW][6]|= 0x00FF; // Ïåðèîäû ïîñûëîê
Maska[m_FAST][7]|= 0x0100; // Ñ÷åò÷èê ïîñûëîê
Maska[m_SLOW][7]|= 0x0E00; // Ñ÷åò÷èê ïîñûëîê
Maska[m_SLOW][6]|= 0x007F; // Ïåðèîäû ïîñûëîê
Maska[m_SLOW][7]|= 0xE000; // Ïðîòîêîë, àäðåñ, êîìàíäû
}