Commit 540b33cf authored by 王金山's avatar 王金山

Merge branch 'dev' into 'master'

变更项6,增加ESC、ESC OFF指示灯

See merge request !35
parents 91245d13 a019c6e4
...@@ -1784,11 +1784,12 @@ void Telltales_Management(void) ...@@ -1784,11 +1784,12 @@ void Telltales_Management(void)
if (NVM_CONFIG_ESC == 0) if (NVM_CONFIG_ESC == 0)
//ESC 锟斤拷锟斤拷指示锟斤拷 13 //ESC 锟斤拷锟斤拷指示锟斤拷 13
{ {
if ((VDC_Information_Signal == 0X01) && (VDC_Fully_Operational == 0) && (ASR_OffRoad_Switch == 0)) if ((VDC_Information_Signal == 0X01) && (VDC_Fully_Operational == 0) &&
((ASR_OffRoad_Switch == 0) && ((EBC1_STATUS & CAN_MSG_LOST) == 0)))
TelltaleLCDFlag.Sig.LCD14 = 1; TelltaleLCDFlag.Sig.LCD14 = 1;
else if ((VDC_Information_Signal == 0X01) && (VDC_Fully_Operational == 0X01)) else if ((VDC_Information_Signal == 0X01) && (VDC_Fully_Operational == 0X01))
{ {
if (FLASH_SYNC_1Hz) if (FLASH_SYNC_2Hz)
TelltaleLCDFlag.Sig.LCD14 = 1; TelltaleLCDFlag.Sig.LCD14 = 1;
else else
TelltaleLCDFlag.Sig.LCD14 = 0; TelltaleLCDFlag.Sig.LCD14 = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment