调整指示灯逻辑

source/Application/APP/Telltales/Telltales_user.c

@@ -862,18 +862,24 @@ uint8_t LED_AEBS_OFF_L_Judgement(void)
     m_Condition5 = (uint8_t)Get_ID_18FECAA1_Sig_AebsOff();
     m_Condition6 = (uint8_t)Get_ID_18FECAA0_Sig_AebsOff();
 
-    if (
-        ((m_Condition1 == 0x02u) || (m_Condition2 == 0x02u) || (m_Condition3 == 0x02u) ||
-         ((CanStatus1 == CAN_SIG_LOST) && (CanStatus2 == CAN_SIG_LOST) && (CanStatus3 == CAN_SIG_LOST)) ||
-         (m_Condition4 == 0x01u) || (m_Condition5 == 0x01u) || (m_Condition6 == 0x01u)) &&
-        (K_Line_Set.K_Line_LID28 == 0x01u)
-    )
-    {
-        u8Result = 1u;
-    }
-    else if ((m_Condition1 == 0x0Eu) || (m_Condition2 == 0x0Eu) || (m_Condition3 == 0x0Eu))
+    if (K_Line_Set.K_Line_LID28 == 0x01u)
     {
-        u8Result = FLASH_SYNC_1Hz;
+        if (
+            (m_Condition1 == 0x02u) || (m_Condition2 == 0x02u) || (m_Condition3 == 0x02u) ||
+            ((CanStatus1 == CAN_SIG_LOST) && (CanStatus2 == CAN_SIG_LOST) && (CanStatus3 == CAN_SIG_LOST)) ||
+            (m_Condition4 == 0x01u) || (m_Condition5 == 0x01u) || (m_Condition6 == 0x01u)
+        )
+        {
+            u8Result = 1u;
+        }
+        else if ((m_Condition1 == 0x0Eu) || (m_Condition2 == 0x0Eu) || (m_Condition3 == 0x0Eu))
+        {
+            u8Result = FLASH_SYNC_1Hz;
+        }
+        else
+        {
+            u8Result = 0u;
+        }
     }
     else
     {
@@ -884,10 +890,18 @@ uint8_t LED_AEBS_OFF_L_Judgement(void)
 }
 void LED_AEBS_OFF_L_Execution(uint8_t led_status)
 {
-    if (led_status == 1)
+    if (K_Line_Set.K_Line_LID28 == 0x01u)
     {
-        IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESSY;
-        SEG_LED_AEBS_OFF_L(7);
+        if (led_status == 1)
+        {
+            IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESSY;
+            SEG_LED_AEBS_OFF_L(7);
+        }
+        else
+        {
+            IS31_CHIP0_CHANNEL03 = 0x00;
+            SEG_LED_AEBS_OFF_L(0);
+        }
     }
     else
     {
@@ -916,16 +930,20 @@ uint8_t LED_LDWS_L_Judgement(void)
     CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE5BE8_Msg_Count);
     CanStatus2 = CAN_MSG_Status(ID_CanMsg18FECAE8_Msg_Count);
 
-    if (
-        ((CanStatus1 == CAN_SIG_LOST) || (m_Condition1 == 0x02u) || (m_Condition2 == 0x01u)) &&
-        (K_Line_Set.K_Line_LID27 == 0x01u)
-    )
-    {
-        u8Result = 1u;
-    }
-    else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu))
+    if (K_Line_Set.K_Line_LID27 == 0x01u)
     {
-        u8Result = FLASH_SYNC_1Hz;
+        if ((CanStatus1 == CAN_SIG_LOST) || (m_Condition1 == 0x02u) || (m_Condition2 == 0x01u))
+        {
+            u8Result = 1u;
+        }
+        else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu))
+        {
+            u8Result = FLASH_SYNC_1Hz;
+        }
+        else
+        {
+            u8Result = 0u;
+        }
     }
     else
     {
@@ -936,10 +954,18 @@ uint8_t LED_LDWS_L_Judgement(void)
 }
 void LED_LDWS_L_Execution(uint8_t led_status)
 {
-    if (led_status == 1)
+    if (K_Line_Set.K_Line_LID27 == 0x01u)
     {
-        IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESSY;
-        SEG_LED_LDWS_L(7);
+        if (led_status == 1)
+        {
+            IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESSY;
+            SEG_LED_LDWS_L(7);
+        }
+        else
+        {
+            IS31_CHIP0_CHANNEL04 = 0x00;
+            SEG_LED_LDWS_L(0);
+        }
     }
     else
     {

source/Application/Graphic/Menu/Menu.h

@@ -9,7 +9,7 @@
 #define EXTERN_MEU_PROCESS extern
 #endif
 
-#define K_Line_User_RYLQQ       100
+#define K_Line_User_RYLQQ        44
 #define K_Line_User_KQGZJ       100
 
 #define _MN_IDX_NULL 0xff

source/Application/RTE/Common_Interface.c

@@ -866,12 +866,12 @@ void K_LINE_EOL_InitVal(void)
     K_Line_Set.K_Line_LID47 = 0xFFu; /* FF 急减速                                         /*初值FF*/
     K_Line_Set.K_Line_LID48 = 0xFFu; /* FF 长时间怠速                                     /*初值FF*/
     K_Line_Set.K_Line_LID49 = 0xFFu; /* FF 辅助驻车                                       /*初值FF*/
-    K_Line_Set.K_Line_LID4A = 0x32u; /* 32 变速箱油              5000 */
-    K_Line_Set.K_Line_LID4B = 0x32u; /* 32 差速器油              5000 */
-    K_Line_Set.K_Line_LID4C = 0x32u; /* 32 离合器油                     */
-    K_Line_Set.K_Line_LID4D = 0x64u; /* 64 动力转向油             10000 */
-    K_Line_Set.K_Line_LID4E = 0x78u; /* 78 轮胎                  12000 */
-    K_Line_Set.K_Line_LID4F = 0x32u; /* 32 机油＆滤清器            5000 */
+    K_Line_Set.K_Line_LID4A = 0x32u; /* 37 变速箱油              55000 */
+    K_Line_Set.K_Line_LID4B = 0x32u; /* 37 差速器油              55000 */
+    K_Line_Set.K_Line_LID4C = 0x32u; /* 37 离合器油              55000 */
+    K_Line_Set.K_Line_LID4D = 0x64u; /* 37 动力转向油             55000 */
+    K_Line_Set.K_Line_LID4E = 0x78u; /* 32 轮胎                  50000 */
+    K_Line_Set.K_Line_LID4F = 0x32u; /* 34 机油＆滤清器           22000 */
     K_Line_Set.K_Line_LID50 = 0x00u; /* -- 预留 */
     K_Line_Set.K_Line_LID51 = 0x01u; /* 01 工作模式 */
     K_Line_Set.K_Line_LID52 = 0x00u; /* 00 电子部件设定 */