调整指示灯问题

source/Application/APP/Telltales/Telltales_user.c

@@ -1320,25 +1320,29 @@ uint8_t LED_EVSC_L_Judgement(void)
     uint8_t u8Result = 0u;
     uint8_t CanStatus1 = 0u;
     uint8_t CanStatus2 = 0u;
-    uint8_t m_Condition1 = 0u;
-    uint8_t m_Condition2 = 0u;
-    uint8_t m_Condition3 = 0u;
-    uint8_t m_Condition4 = 0u;
-    uint8_t m_Condition5 = 0u;
-    uint8_t m_Condition8 = 0u;
+    uint8_t LineStatus1 = 0u;
+    uint8_t CanDataSta1 = 0u;
+    uint8_t CanDataSta2 = 0u;
+    uint8_t CanDataSta3 = 0u;
+    uint8_t CanDataSta4 = 0u;
+    uint8_t CanDataSta5 = 0u;
     uint16_t m_Condition6 = 0u;
     uint16_t m_Condition7 = 0u;
     uint8_t m_AirSta1 = 0u;
     uint8_t m_AirSta2 = 0u;
 
-    CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE4F0B_Msg_Count);
+    LineStatus1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); /*A28*/
+
     CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
-    m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); /*A28*/
-    m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); /*byte6 34*/
-    m_Condition8 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();/*byte6 56*/
-    m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();/*byte6 78*/
-    m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State();/*byte1 12*/
-    m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();/*byte1 34*/
+    CanDataSta2 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Lamp_State(); /*byte1 12*/
+    CanDataSta3 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(); /*byte1 34*/
+    CanDataSta1 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); /*byte6 34*/
+    (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();/*byte6 56*/
+    (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();/*byte6 78*/
+
+    CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE4F0B_Msg_Count);
+    CanDataSta5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State(); /*byte1 12*/
+    CanDataSta4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational(); /*byte1 34*/
     m_Condition6 = Common_Get_Air1_Data();  /*气压1 1.89以下*/
     m_Condition7 = Common_Get_Air2_Data();  /*气压1 1.89以下*/
     m_AirSta1 = Common_Get_Air1_Valid();
@@ -1357,15 +1361,15 @@ uint8_t LED_EVSC_L_Judgement(void)
     }
 
     if (
-        (m_Condition1 == 1u) || (Common_Get_L12_Air_Sta() == 1u) ||
-        (((m_Condition2 == 1u) || (CanStatus2 == CAN_SIG_LOST)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
-        (((m_Condition5 == 0u) || (CanStatus1 == CAN_SIG_LOST)) && (K_Line_Set.K_Line_LID22 == 0x01u))
+        (LineStatus1 == 1u) || (Common_Get_L12_Air_Sta() == 1u) ||
+        (((CanDataSta1 == 1u) || (CanStatus2 == CAN_SIG_LOST)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
+        (((CanDataSta4 == 0u) || (CanStatus1 == CAN_SIG_LOST)) && (K_Line_Set.K_Line_LID22 == 0x01u))
     )
     {
         u8Result = 1u;
     }
-    else if (((m_Condition8 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
-             ((m_Condition4 == 1u) && (K_Line_Set.K_Line_LID22 == 0x01u)))
+    else if ((((CanDataSta2 == 1u) || (CanDataSta3 == 1u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
+             ((CanDataSta5 == 1u) && (K_Line_Set.K_Line_LID22 == 0x01u)))
     {
         u8Result = FLASH_SYNC_2Hz;
     }
@@ -1831,11 +1835,11 @@ uint8_t LED_ABS_R_Judgement(void)
     uint8_t m_Condition2 = 0u;
     uint8_t CanStatus1 = 0u;
 
-    m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
+    m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_ABS_Fully_Operational();/*byte 6 12*/
     CanStatus1 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
     m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ABS);
 
-    if ((((CanStatus1 == CAN_SIG_LOST) || (m_Condition2 == 1u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
+    if ((((CanStatus1 == CAN_SIG_LOST) || (m_Condition2 == 0u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
             (m_Condition1 == 1u) && (K_Line_Set.K_Line_LID21 == 0x03u))
     {
         u8Result = 1u;

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -787,6 +787,11 @@ uint8_t  Get_ID_18F0010B_Sig_EBS_Amber_Warning_State(void)
     return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 5u) >> 4u) & 0x03u));
 }
 
+uint8_t  Get_ID_18F0010B_Sig_ASR_Lamp_State(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 0u) & 0x03u));
+}
+
 uint8_t  Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void)
 {
     return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 2u) & 0x03u));

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h

@@ -191,6 +191,7 @@ extern uint8_t  Get_ID_18FE4F0B_Sig_VDC_Lamp_State(void);
 extern uint8_t  Get_ID_18FE4F0B_Sig_VDC_Fully_operational(void);
 extern uint8_t  Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State(void);
 extern uint8_t  Get_ID_18F0010B_Sig_EBS_Amber_Warning_State(void);
+extern uint8_t  Get_ID_18F0010B_Sig_ASR_Lamp_State(void);
 extern uint8_t  Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void);
 extern uint8_t  Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(void);
 extern uint8_t  Get_ID_18F0010B_Sig_ABS_Fully_Operational(void);

source/Application/Graphic/GUI/GUI.c

@@ -557,6 +557,8 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
     uint8_t CanStatus2 = 0u;
     uint8_t EBSLamp_State = 0u;
 
+    uint8_t EBSWarning_State = 0u;
+
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
         /*超速报警指示灯*/
@@ -571,7 +573,7 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
             GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_01_1, 21u, GUI_DISP_LEMPY[0u], GUI_BLENDMODE_SRC_OVER);
         }
 
-        /*EBS指示灯*/
+        /*EBS Red指示灯*/
         EBSLamp_State = Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
         CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
 
@@ -579,9 +581,17 @@ void GUI_TFTTelltales_Display(uint8_t Mode)
         {
             GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_02_1, 21u, GUI_DISP_LEMPY[1u], GUI_BLENDMODE_SRC_OVER);
         }
+
+        /*EBS Yellow指示灯*/
+        EBSWarning_State = Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
+
+        if (((EBSWarning_State == 0x01u) || (CanStatus2 == CAN_SIG_LOST)) && (K_Line_Set.K_Line_LID21 == 0x01u))
+        {
+            GUI_Translate_Display(WarningLight_Sprite, CN_Alarm_03, 21u, GUI_DISP_LEMPY[2u], GUI_BLENDMODE_SRC_OVER);
+        }
         else
         {
-            GUI_General_Display(WarningLight_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM );
+            GUI_General_Display(WarningLight_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
         }
     }
     else