车厂调整指示灯影线报警BUG

source/Application/APP/Data_Fuel/Data_Fuel_User.c

@@ -287,4 +287,6 @@ uint8_t Fuel_Get_Popup_Sta(void)
     {
         Popup_Sta = 0u;
     }
+
+    return Popup_Sta;
 }
\ No newline at end of file

source/Application/APP/LINE_IN/Line_In_user.c

@@ -53,7 +53,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC_AIR,},                     /*B15  ACC AIR*/
     {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_AIR_SUS,},                     /*B30  AIR SUS*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_BRAKE,},               /*B31  TRAILER BRAKE*/
-    {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,},                 /*B33  TRAILER ABS*/
+    {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,},                 /*B33  TRAILER ABS*/
     {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,},                /*B36  RR DIFF LOCK*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,},                    /*B38  WEAR IND*/
 

source/Application/APP/Telltales/Telltales_user.c

@@ -243,31 +243,31 @@ void Telltales_Left_Right_Management_Service(void) /*10ms*/
         Edge = RIGHT_ST;
     }
 
-    if (TelltaleLRCtrl.Delay > 0u)
-    {
-        TelltaleLRCtrl.Delay--;
-    }
-    else
-    {
-        if (Edge != 0xFFu)
-        {
-            if (Edge)
-            {
-                Sound_Request(SND_TICK, 1u);
-            }
-            else
-            {
-                Sound_Request(SND_TOCK, 1u);
-            }
-
-            TelltaleLRCtrl.Delay = 10u; /*200ms内不允许重复播放声音*/
-        }
-        else
-        {
-            Sound_Delete(SND_TICK);
-            Sound_Delete(SND_TOCK);
-        }
-    }
+//    if (TelltaleLRCtrl.Delay > 0u)
+//    {
+//        TelltaleLRCtrl.Delay--;
+//    }
+//    else
+//    {
+//        if (Edge != 0xFFu)
+//        {
+//            if (Edge)
+//            {
+//                Sound_Request(SND_TICK, 1u);
+//            }
+//            else
+//            {
+//                Sound_Request(SND_TOCK, 1u);
+//            }
+//
+//            TelltaleLRCtrl.Delay = 10u; /*200ms内不允许重复播放声音*/
+//        }
+//        else
+//        {
+//            Sound_Delete(SND_TICK);
+//            Sound_Delete(SND_TOCK);
+//        }
+//    }
 }
 
 void LED_Left_Right_Execution(uint8_t led_status)
@@ -1466,7 +1466,7 @@ void LED_AMT_L_Execution(uint8_t led_status)
   L15 WEAR IND
   信号接口： B38 0V B40 0V
   信号定义：
-  输出信号：
+  输出信号： 接地熄灭20220524
  ******************************************************************************/
 uint8_t LED_WEAR_IND_L_Judgement(void)
 {
@@ -1477,13 +1477,13 @@ uint8_t LED_WEAR_IND_L_Judgement(void)
     m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_WEAR_IND);
     m_Condition2 = (uint8_t)Line_In_Get_Status(LINE_IN_WEAR2);
 
-    if ((m_Condition1 == 1u) || (m_Condition2 == 0x01u))
+    if ((m_Condition1 == 0x01u) && (m_Condition2 == 0x01u))
     {
-        u8Result = 1u;
+        u8Result = 0u;
     }
     else
     {
-        u8Result = 0u;
+        u8Result = 1u;
     }
 
     return u8Result;
@@ -2013,7 +2013,6 @@ uint8_t LED_Fuel_Judgement(void)
         u8Result = 0u;
     }
 
-
     return u8Result;
 }
 void LED_Fuel_Execution(uint8_t led_status)

source/Application/Alarm/Popups.c

@@ -788,7 +788,7 @@ void Popups_Polling(void)
             /*52.--6--后蹄片磨损*/
             variable_1 = Line_In_Get_Status(LINE_IN_WEAR2);
 
-            if (variable_1 == LINE_IN_LOGIC_VALID)
+            if (variable_1 == LINE_IN_LOGIC_INVALID)
             {
                 Popup_Request(POPUP8_BRAKE_BLOCKR);
             }
@@ -800,7 +800,7 @@ void Popups_Polling(void)
             /*53.--7--前蹄片磨损*/
             variable_1 = Line_In_Get_Status(LINE_IN_WEAR_IND);
 
-            if (variable_1 == LINE_IN_LOGIC_VALID)
+            if (variable_1 == LINE_IN_LOGIC_INVALID)
             {
                 Popup_Request(POPUP8_BRAKE_BLOCKF);
             }