Merge branch 'shihao' into 'develop'

Shihao

See merge request !20

source/Appliciation/CAN_App/CAN_APP.c

@@ -593,7 +593,7 @@ void Can_Set_Buff_18A97121(canlib_uint8_t CopyData [])
     p18A97121 = ( CANMsg18A97121Union * )CopyData;
     if ( p18A97121 != ( void * )0 )
     {
-        if(Get_NodeConfig_LWDS() == 1)
+        if((Get_NodeConfig_LWDS() == 1)&&(MenuData.Ldws == 2))
         {
             p18A97121->Sig.LaneDepWarnEnaCmd = 1;
         }

source/Appliciation/Display/GUI.c

@@ -296,9 +296,9 @@ void GUI_Display_PowerOn(void)
 {
     Draw_Image_Local(( uint8_t * )Kai_tu_01_X38_Y122, 39, 122);
     Draw_Image_Local(( uint8_t * )Kai_V_X175_Y287, 175, 287);
-    Draw_Image_Local(( uint8_t * )Number_17_White_0_X0_Y0, 189, 287);
+    Draw_Image_Local(( uint8_t * )Number_17_White_1_X0_Y0, 189, 287);
     Draw_Image_Local(( uint8_t * )Number_17_White_point3_X0_Y0, 200, 287);
-    Draw_Image_Local(( uint8_t * )Number_17_White_5_X0_Y0, 206, 287);
+    Draw_Image_Local(( uint8_t * )Number_17_White_0_X0_Y0, 206, 287);
 }
 /***********************************************************************************************************************/
 uint16 u16LJSfueltesk[10];

source/Appliciation/Telltales_user.c

@@ -508,11 +508,59 @@ void LED_TurnLeft_Lamp_Exec(Tellib_uint16_t led_status)
   Tellib_uint16_t LED_ABS_Lamp_Judge(void) 
 {
     Tellib_uint16_t res = 0u;
+    if( (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can0A18A006_Msg_Count) == CAN_SIG_LOST )&&(Common_GetIgnOnTime() >= 8000))
+    {
+        res = 2u;
+    }
+    else
+    {
+        if(Get_CAN_CH0_ID_0A18A006_Sig_AbsFail() == 1)
+        {
+            res = 1u;
+        }
+        else
+        {
+            res = 0u;
+        }
+    }
+
     return res;
 }
   void LED_ABS_Lamp_Exec(Tellib_uint16_t led_status) 
 {
+    if(Get_DIAG_TelltalesCtrlsts() == 3)
+    {
+        if(LEDContrl._3F80.ABSAlarm == 1)
+        {
+            LED_Driver_Channel_Set(LED_Attr[LED_ABS_Lamp].chip, LED_Attr[LED_ABS_Lamp].channel, LED_Attr[LED_ABS_Lamp].brightness);
+        }
+        else 
+        {
+            LED_Driver_Channel_Set(LED_Attr[LED_ABS_Lamp].chip, LED_Attr[LED_ABS_Lamp].channel, 0);
+        }
+    }
+    else
+    {
+        if (led_status == 2u)
+        {
+            if(g_LED.LedBlink_1_5HZ)
+            {
+                LED_Driver_Channel_Set(LED_Attr[LED_ABS_Lamp].chip, LED_Attr[LED_ABS_Lamp].channel, LED_Attr[LED_ABS_Lamp].brightness);
+            }
+            else
+            {
                 LED_Driver_Channel_Set(LED_Attr[LED_ABS_Lamp].chip, LED_Attr[LED_ABS_Lamp].channel, 0);
+            }
+        }
+        else if (led_status == 1u)
+        {
+            LED_Driver_Channel_Set(LED_Attr[LED_ABS_Lamp].chip, LED_Attr[LED_ABS_Lamp].channel, LED_Attr[LED_ABS_Lamp].brightness);
+        }
+        else 
+        {
+            LED_Driver_Channel_Set(LED_Attr[LED_ABS_Lamp].chip, LED_Attr[LED_ABS_Lamp].channel, 0);
+        }
+    }
 }
   Tellib_uint16_t LED_EBD_Lamp_Judge(void) 
 {
@@ -1163,14 +1211,39 @@ Tellib_uint16_t Water_High_Res = 0u;
   Tellib_uint16_t LED_Brake_Lamp_Judge(void) 
 {
     Tellib_uint16_t res = 0u;
-    if (( Line_In_Get_Status(LINE_IN_Brake_Fault) == 1u )||( Line_In_Get_Status(LINE_IN_Handbrake) == 1u ))
+    Tellib_uint16_t EBD_lamp = 0u;
+
+    if((CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can0A18A006_Msg_Count) == CAN_SIG_LOST )&&(Common_GetIgnOnTime() >= 8000))
+    {
+        EBD_lamp = 2u;
+    }
+    else
+    {
+        if(Get_CAN_CH0_ID_0A18A006_Sig_EbdFail() == 1)
+        {
+            EBD_lamp = 1u;
+        }
+        else
+        {
+            EBD_lamp = 0u;
+        }
+    } 
+
+    if (( Line_In_Get_Status(LINE_IN_Brake_Fault) == 1u )||( Line_In_Get_Status(LINE_IN_Handbrake) == 1u )||(EBD_lamp == 1))
     {
         res = 1u;
     }
     else
+    {
+        if(EBD_lamp == 2)
+        {
+            res = 2u;
+        }
+        else
         {
             res = 0u;
         }
+    }
     return res;
 }
   void LED_Brake_Lamp_Exec(Tellib_uint16_t led_status) 
@@ -1192,6 +1265,17 @@ Tellib_uint16_t Water_High_Res = 0u;
         {
             LED_Driver_Channel_Set(LED_Attr[LED_Brake_Lamp].chip, LED_Attr[LED_Brake_Lamp].channel, LED_Attr[LED_Brake_Lamp].brightness);
         }
+        else if (led_status == 2u)
+        {
+            if(g_LED.LedBlink_1_5HZ)
+            {
+                LED_Driver_Channel_Set(LED_Attr[LED_Brake_Lamp].chip, LED_Attr[LED_Brake_Lamp].channel, LED_Attr[LED_Brake_Lamp].brightness);
+            }
+            else
+            {
+                LED_Driver_Channel_Set(LED_Attr[LED_Brake_Lamp].chip, LED_Attr[LED_Brake_Lamp].channel, 0);
+            }
+        }
         else 
         {
             LED_Driver_Channel_Set(LED_Attr[LED_Brake_Lamp].chip, LED_Attr[LED_Brake_Lamp].channel, 0);

source/UDS/UDS_22Service_Main.c

 #include "UDS_22Service_Main.h"
 #include "UDS_Common.h"
 /*EcuPartNumber（电控单元零件号）*/
-const uint8_t DID_22_F187[12]   = {'5','8','0','3','2','7','2','3','6','5',0x20,0x20};
+const uint8_t DID_22_F187[12]   = {'5','8','0','3','3','1','2','6','7','1',0x20,0x20};
 /*SystemSupplierID（系统供应商标识号）*/
 const uint8_t DID_22_F18A[10]    = {'1','7','3','8',0x20,0x20,0x20,0x20,0x20,0x20};
 /*Supplier ECU Serial Number（供应商电控单元序列号） */