Merge branch 'CHENJIALE' into 'dev'

Chenjiale

See merge request !47

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -74,7 +74,7 @@ void Gauge_Service(void)
             Check_SEG_Display();    
             for(k = 0; k < LampCh0_MAX; k ++)     
             {
-                if (k == 24)
+                if (k == 24 || k == 21 || k == 13 || k == 26)
                 {
                     k ++;
                 }

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c

@@ -2260,7 +2260,7 @@ void SEG_SET_TPMS_DISPLAY(uint8_t m_Flag, uint16_t m_NUM1, uint16_t m_NUM2, uint
         }
         else
         {
-            IC2_SEG109 = IC_SEG_ON;
+            IC2_SEG109 = IC_SEG_OFF;
             IC2_SEG110 = IC_SEG_ON;
             IC2_SEG118 = IC_SEG_ON;
             IC2_SEG138 = IC_SEG_ON;

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -286,14 +286,18 @@ static void LED_Fuel_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Coolant_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if(GET_DataCollantTempWarnflg() == 2)
+    if(ClearODO_Flag == 1)
     {
-        LED_STATE = 2;
+        LED_STATE = 1;
     }
     else if (GET_DataCollantTempWarnflg() == 1)
     {
         LED_STATE = 3;
     }
+    else if(GET_DataCollantTempWarnflg() == 2)
+    {
+        LED_STATE = 2;
+    }
     else
     {
         LED_STATE = 4;
@@ -621,7 +625,11 @@ static void LED_Lateral_Strut_Execution(Tellib_uint16_t led_status)
 static Tellib_uint16_t LED_Tire_Pressure_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
-    if((Get_Front_FirstLearn_Flag() == 2) || (Get_Rear_FirstLearn_Flag() == 2))
+    if(ClearODO_Flag == 1)
+    {
+        LED_STATE = 1;
+    }
+    else if((Get_Front_FirstLearn_Flag() == 2) || (Get_Rear_FirstLearn_Flag() == 2))
     {
         if(Get_Led_TPMS_Waring() == 1)
         {