Merge branch 'wangyanan' into 'dev'

🐞 fix:修复左右转向灯、远光灯、ABS、自动启停灯、E/S灯逻辑

See merge request !22

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -56,7 +56,6 @@ const LED_Attribute_st LED_Attribute [ LED_Max ] = {
     {em_LED_WIFI,                 SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_WIFI_Judgement,                 LED_WIFI_Execution                     },
     {em_LED_Bluetooth,            SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_Bluetooth_Judgement,            LED_Bluetooth_Execution                },
     {em_LED_E,                    SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_E_Judgement,                    LED_E_Execution                        },
-    {em_LED_S,                    SelfCheck,     NoExterNalCheck,        LED_IGN_ON,             0u,         3000ul,         LED_S_Judgement,                    LED_S_Execution                        },
 };
 Tellib_uint8_t Tel_Mem [ Tel_MEM_Block_Size * LED_Max + Tel_MEM_Block_Addition ];
  void Telltales_Init(void)
@@ -139,13 +138,13 @@ static void LED_High_Beam_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Efi_Fault_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if (Line_In_Get_Status(LINE_IN_Efi_Fault))
+    if (Line_In_Get_Status(LINE_IN_Efi_Fault) == 0u)
     {
-        LED_STATE = 1;
+        LED_STATE = 1u;
     }
     else
     {
-        LED_STATE = 0;
+        LED_STATE = 0u;
     }
     return LED_STATE;
 }
@@ -159,13 +158,13 @@ static void LED_Efi_Fault_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_ABS_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if (Line_In_Get_Status(LINE_IN_ABS))
+    if (Line_In_Get_Status(LINE_IN_ABS) == 0)
     {
-        LED_STATE = 1;
+        LED_STATE = 0;
     }
     else
     {
-        LED_STATE = 0;
+        LED_STATE = 1;
     }
     return LED_STATE;
 }
@@ -178,7 +177,7 @@ static void LED_ABS_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Auto_Start_Stop_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if (Line_In_Get_Status(LINE_IN_Auto_Start_Stop))
+    if (Line_In_Get_Status(LINE_IN_Auto_Start_Stop) == 0)
     {
         LED_STATE = 1;
     }
@@ -198,7 +197,7 @@ static void LED_Auto_Start_Stop_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Oil_Pressure_Alert_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if (Line_In_Get_Status(LINE_IN_Oil_Pressure_Alert))
+    if (Line_In_Get_Status(LINE_IN_Oil_Pressure_Alert) == 0)
     {
         LED_STATE = 1;
     }
@@ -213,8 +212,10 @@ static void LED_Oil_Pressure_Alert_Execution(Tellib_uint16_t led_status)
   
 }
 
-
-/*CAN信号来源：TCS_37B*/
+/*
+*@name:TCS指示灯
+*@return: 0-都不亮 1-TCS亮 2-TCS/亮 3-TCS闪烁 
+*/
 static Tellib_uint16_t LED_TCS_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
@@ -224,13 +225,27 @@ static Tellib_uint16_t LED_TCS_Judgement(void)
     }
     else
     {
-       if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 1)
+        if(Get_CAN_CH0_ID_37B_Sig_TCS_Work_Mode == 0x0)
         {
-           LED_STATE = 1u;
+            if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x1)
+            {
+                LED_STATE = 1u;/*TCS灯亮*/
             }
             else
             {
-           LED_STATE = 0u;
+                LED_STATE = 0u;/*都不亮*/
+            }
+        }
+        else
+        {
+            if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x1)
+            {
+                LED_STATE = 2u;/*TCS/亮*/
+            }
+            else
+            {
+                ;
+            } 
         } 
     }
     return LED_STATE;
@@ -241,7 +256,9 @@ static void LED_TCS_Execution(Tellib_uint16_t led_status)
 }
 
 
-/*信号来源：ISG_111*/
+/*
+*信号来源：ISG_111
+*/
 static Tellib_uint16_t LED_HEV_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
@@ -251,10 +268,14 @@ static Tellib_uint16_t LED_HEV_Judgement(void)
     }
     else
     {
-      if(Get_CAN_CH0_ID_111_Sig_ISG_Ready() == 0x01UL)
+        if((Get_CAN_CH0_ID_111_Sig_ISG_Ready() == 0x01UL)||((Get_CAN_CH0_ID_111_Sig_ISG_Power() == 1u)&&(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 0u)))
         {
             LED_STATE = 1u;
         }
+        else if((Get_CAN_CH0_ID_111_Sig_ISG_Ready() == 0UL)||(Get_CAN_CH0_ID_111_Sig_ISG_Power() == 0u)||(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 0u))
+        {
+            LED_STATE = 0u;
+        }
         else
         {
             LED_STATE = 0u;
@@ -264,7 +285,7 @@ static Tellib_uint16_t LED_HEV_Judgement(void)
 }
 static void LED_HEV_Execution(Tellib_uint16_t led_status)
 {
-   
+   ;
 }
 
 
@@ -284,7 +305,7 @@ static Tellib_uint16_t LED_Voltage_Judgement(void)
 }
 static void LED_Voltage_Execution(Tellib_uint16_t led_status)
 {
-  
+  ;
 }
 
 
@@ -315,16 +336,18 @@ static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
     if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CH0_101_Msg_Count) == CAN_SIG_LOST)
     {
         LED_STATE = 0u;
+        if(Line_In_Get_Status(LINE_IN_Coolant_Temperature))
+        {
+            LED_STATE = 1u;
         }
         else
         {
-        if(Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State() == 0x01UL)
-        {
-          LED_STATE = 1u;
+            LED_STATE = 0u;
+        }
     }
     else
     {
-            if(Line_In_Get_Status(LINE_IN_Voltage))
+        if(Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State() == 0x01UL)
         {
           LED_STATE = 1u;
         }
@@ -333,7 +356,6 @@ static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
             LED_STATE = 0u;
         }
     }
-    }
     return LED_STATE;
 }
 static void LED_Coolant_Temperature_Execution(Tellib_uint16_t led_status)
@@ -342,7 +364,7 @@ static void LED_Coolant_Temperature_Execution(Tellib_uint16_t led_status)
 }
 
 
-/*无*/
+/*wifi*/
 static Tellib_uint16_t LED_WIFI_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;/*设置为常灭*/
@@ -350,10 +372,10 @@ static Tellib_uint16_t LED_WIFI_Judgement(void)
 }
 static void LED_WIFI_Execution(Tellib_uint16_t led_status)
 {
- 
+    ;
 }
 
-/*信号来源：蓝牙模块*/
+/*bluetooth*/
 static Tellib_uint16_t LED_Bluetooth_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
@@ -361,10 +383,15 @@ static Tellib_uint16_t LED_Bluetooth_Judgement(void)
 }
 static void LED_Bluetooth_Execution(Tellib_uint16_t led_status)
 {
-   
+   ;
 }
 
-/*信号来源：0x111*/
+
+/*
+* E S指示灯
+*信号来源：0x111
+* 0-都不亮  1-E亮 2-S亮
+*/
 static Tellib_uint16_t LED_E_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
@@ -376,42 +403,13 @@ static Tellib_uint16_t LED_E_Judgement(void)
     {
         if(Get_CAN_CH0_ID_111_Sig_ISG_Power() == 0x01UL)
         {
-            if(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 1)
+            if(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 1u)
             {
                 LED_STATE = 1u;
             }
-            else
-            {
-                LED_STATE = 0u;
-            }
-        }
-        else
-        {
-            LED_STATE = 0u;
-        }
-    }
-    return LED_STATE;
-}
-static void LED_E_Execution(Tellib_uint16_t led_status)
-{
-   
-}
-
-/*信号来源：0x111*/
-static Tellib_uint16_t LED_S_Judgement(void)
-{
-    Tellib_uint16_t LED_STATE = 0u;
-    if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CH0_111_Msg_Count) == CAN_SIG_LOST)
-    {
-       LED_STATE = 0u;
-    }
-    else
-    {
-        if(Get_CAN_CH0_ID_111_Sig_ISG_Power() == 0x01UL)
-        {
-            if(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 0x2UL)
+            else if(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 2u)
             {
-                LED_STATE = 1u;
+                LED_STATE = 2u;
             }
             else
             {
@@ -425,7 +423,8 @@ static Tellib_uint16_t LED_S_Judgement(void)
     }
     return LED_STATE;
 }
-static void LED_S_Execution(Tellib_uint16_t led_status)
+static void LED_E_Execution(Tellib_uint16_t led_status)
 {
-  
+   ;
 }
+