Commit 074def16 authored by hu's avatar hu

调整指示灯逻辑

parent fc431538
...@@ -202,17 +202,13 @@ void Test_LED_AllLight(void) ...@@ -202,17 +202,13 @@ void Test_LED_AllLight(void)
#endif #endif
/*---------------------------------------------------------------------------*/
/*ZH:*/
#define XXXX 0u #define XXXX 0u
#define LED_BRIGHTNESS 0xff #define LED_BRIGHTNESS 0xff
uint8_t HYQ = 0U;
/****************************************************************************** /******************************************************************************
T1 INTER DIFF LOCK T1 INTER DIFF LOCK
信号接口: 信号接口: B36 HIGH
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -220,7 +216,8 @@ uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void) ...@@ -220,7 +216,8 @@ uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_RR_DIFF_LOCK);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
{ {
...@@ -294,7 +291,7 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status) ...@@ -294,7 +291,7 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
T4 EXH BRAKE T4 EXH BRAKE
信号接口: 信号接口: 0x18FF2300 Byte:2,bit:2-1==00(B)
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -305,7 +302,7 @@ uint8_t LED_EXH_BRAKE_T_Judgement(void) ...@@ -305,7 +302,7 @@ uint8_t LED_EXH_BRAKE_T_Judgement(void)
m_Condition1 = (uint8_t)Get_ID_18FF2300_Sig_Exh_Lamp(); m_Condition1 = (uint8_t)Get_ID_18FF2300_Sig_Exh_Lamp();
if (m_Condition1 == 0x01u) if (m_Condition1 == 0x00u)
{ {
u8Result = 1u; u8Result = 1u;
} }
...@@ -339,7 +336,7 @@ void LED_EXH_BRAKE_T_Execution(uint8_t led_status) ...@@ -339,7 +336,7 @@ void LED_EXH_BRAKE_T_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
T5 QOS(GLOW) T5 QOS(GLOW)
信号接口: 信号接口: 0x18FF2300 Byte:2,bit:6-5==01(B)
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -347,6 +344,7 @@ uint8_t LED_QOS_GLOW_T_Judgement(void) ...@@ -347,6 +344,7 @@ uint8_t LED_QOS_GLOW_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Get_ID_18FF2300_Sig_Glow_Lamp(); m_Condition1 = (uint8_t)Get_ID_18FF2300_Sig_Glow_Lamp();
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -382,7 +380,7 @@ void LED_QOS_GLOW_T_Execution(uint8_t led_status) ...@@ -382,7 +380,7 @@ void LED_QOS_GLOW_T_Execution(uint8_t led_status)
} }
/****************************************************************************** /******************************************************************************
T6 HI BEAM T6 HI BEAM
信号接口: 信号接口: A25 HIGH
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -390,6 +388,7 @@ uint8_t LED_HI_BEAM_T_Judgement(void) ...@@ -390,6 +388,7 @@ uint8_t LED_HI_BEAM_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_HI_BEAM); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_HI_BEAM);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -426,7 +425,7 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status) ...@@ -426,7 +425,7 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
T7 Rr FOG LAMP T7 Rr FOG LAMP
信号接口: 信号接口: B14 HIGH
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -434,6 +433,7 @@ uint8_t LED_Rr_FOG_LAMP_T_Judgement(void) ...@@ -434,6 +433,7 @@ uint8_t LED_Rr_FOG_LAMP_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_Rr_FOG_LAMP); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_Rr_FOG_LAMP);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -463,7 +463,7 @@ void LED_Rr_FOG_LAMP_T_Execution(uint8_t led_status) ...@@ -463,7 +463,7 @@ void LED_Rr_FOG_LAMP_T_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
T8 MIL T8 MIL
信号接口: 信号接口: A31 HIGH
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -471,6 +471,7 @@ uint8_t LED_MIL_T_Judgement(void) ...@@ -471,6 +471,7 @@ uint8_t LED_MIL_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_MIL); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_MIL);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -507,7 +508,7 @@ void LED_MIL_T_Execution(uint8_t led_status) ...@@ -507,7 +508,7 @@ void LED_MIL_T_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
T9 SVS T9 SVS
信号接口: 信号接口: 0x18FED900 Byte:5,bit:8-7==01(B)
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -515,6 +516,7 @@ uint8_t LED_SVS_T_Judgement(void) ...@@ -515,6 +516,7 @@ uint8_t LED_SVS_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Get_ID_18FED900_Sig_SVS_Lamp_Status(); m_Condition1 = (uint8_t)Get_ID_18FED900_Sig_SVS_Lamp_Status();
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -576,21 +578,21 @@ void LED_H_S_A_T_Execution(uint8_t led_status) ...@@ -576,21 +578,21 @@ void LED_H_S_A_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL28 = LED_BRIGHTNESS; // 绿灯 亮 IS31_CHIP0_CHANNEL28 = LED_BRIGHTNESS; /*绿灯 亮*/
IS31_CHIP0_CHANNEL29 = 0x00; // 黄灯 灭 IS31_CHIP0_CHANNEL29 = 0x00; /*黄灯 灭*/
} }
else if (led_status == 2) else if (led_status == 2)
{ {
IS31_CHIP0_CHANNEL28 = 0x00; // 绿灯 灭 IS31_CHIP0_CHANNEL28 = 0x00; /*绿灯 灭*/
IS31_CHIP0_CHANNEL29 = LED_BRIGHTNESS; // 黄灯 亮 IS31_CHIP0_CHANNEL29 = LED_BRIGHTNESS; /*黄灯 亮*/
} }
else else
{ {
IS31_CHIP0_CHANNEL28 = 0x00; // 绿灯 灭 IS31_CHIP0_CHANNEL28 = 0x00; /*绿灯 灭*/
IS31_CHIP0_CHANNEL29 = 0x00; // 黄灯 灭 IS31_CHIP0_CHANNEL29 = 0x00; /*黄灯 灭*/
} }
if ((led_status == 1) || (led_status == 2)) if (led_status != 0x00u)
{ {
SEG_LED_H_S_A_T(7); SEG_LED_H_S_A_T(7);
} }
...@@ -602,7 +604,7 @@ void LED_H_S_A_T_Execution(uint8_t led_status) ...@@ -602,7 +604,7 @@ void LED_H_S_A_T_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
T11 RETARDER T11 RETARDER
信号接口: 信号接口: 0x18FF5510 Byte:1,bit:1==01(B) 绿 ---- 0x18FF5510 Byte1,Bit1 Byte:1,bit:1==10(B) 黄闪
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -640,28 +642,38 @@ uint8_t LED_RETARDER_T_Judgement(void) ...@@ -640,28 +642,38 @@ uint8_t LED_RETARDER_T_Judgement(void)
} }
void LED_RETARDER_T_Execution(uint8_t led_status) void LED_RETARDER_T_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (K_Line_Set.K_Line_LID41 == 0x13u)
{
IS31_CHIP0_CHANNEL27 = LED_BRIGHTNESS; // 绿灯 亮
IS31_CHIP0_CHANNEL26 = 0x00; // 黄灯 灭
}
else if (led_status == 2)
{ {
IS31_CHIP0_CHANNEL27 = 0x00; // 绿灯 灭 if (led_status == 1)
IS31_CHIP0_CHANNEL26 = LED_BRIGHTNESS; // 黄灯 亮 {
IS31_CHIP0_CHANNEL27 = LED_BRIGHTNESS; /* 绿灯 亮 */
IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
}
else if (led_status == 2)
{
IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
IS31_CHIP0_CHANNEL26 = LED_BRIGHTNESS; /* 黄灯 亮 闪 */
}
else
{
IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
}
if (led_status != 0x00u)
{
SEG_LED_RETARDER_T(7);
}
else
{
SEG_LED_RETARDER_T(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL27 = 0x00; // 绿灯 灭 IS31_CHIP0_CHANNEL27 = 0x00; // 绿灯 灭
IS31_CHIP0_CHANNEL26 = 0x00; // 黄灯 灭 IS31_CHIP0_CHANNEL26 = 0x00; // 黄灯 灭
}
if ((led_status == 1) || (led_status == 2))
{
SEG_LED_RETARDER_T(7);
}
else
{
SEG_LED_RETARDER_T(0); SEG_LED_RETARDER_T(0);
} }
} }
...@@ -676,6 +688,7 @@ uint8_t LED_AUTO_LEVELING_T_Judgement(void) ...@@ -676,6 +688,7 @@ uint8_t LED_AUTO_LEVELING_T_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -721,6 +734,7 @@ uint8_t LED_ROWS_L_Judgement(void) ...@@ -721,6 +734,7 @@ uint8_t LED_ROWS_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -765,6 +779,7 @@ uint8_t LED_BSM_OFF_L_Judgement(void) ...@@ -765,6 +779,7 @@ uint8_t LED_BSM_OFF_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -818,11 +833,11 @@ uint8_t LED_AEBS_OFF_L_Judgement(void) ...@@ -818,11 +833,11 @@ uint8_t LED_AEBS_OFF_L_Judgement(void)
if (K_Line_Set.K_Line_LID28 == 0x01u) if (K_Line_Set.K_Line_LID28 == 0x01u)
{ {
if ((m_Condition1 == 2u) || (m_Condition2 == 2u) || (m_Condition3 == 2u)) if ((m_Condition1 == 0x02u) || (m_Condition2 == 0x02u) || (m_Condition3 == 0x02u))
{ {
u8Result = 1u; u8Result = 1u;
} }
else if ((m_Condition1 == 14u) || (m_Condition2 == 14u) || (m_Condition3 == 14u)) else if ((m_Condition1 == 0x0Eu) || (m_Condition2 == 0x0Eu) || (m_Condition3 == 0x0Eu))
{ {
u8Result = FLASH_SYNC_1Hz; u8Result = FLASH_SYNC_1Hz;
} }
...@@ -836,21 +851,30 @@ uint8_t LED_AEBS_OFF_L_Judgement(void) ...@@ -836,21 +851,30 @@ uint8_t LED_AEBS_OFF_L_Judgement(void)
} }
void LED_AEBS_OFF_L_Execution(uint8_t led_status) 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_BRIGHTNESS;
}
else
{ {
IS31_CHIP0_CHANNEL03 = 0x00; if (led_status == 1)
} {
IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESS;
}
else
{
IS31_CHIP0_CHANNEL03 = 0x00;
}
if (led_status == 1)
{ if (led_status == 1)
SEG_LED_AEBS_OFF_L(7); {
SEG_LED_AEBS_OFF_L(7);
}
else
{
SEG_LED_AEBS_OFF_L(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL03 = 0x01u;
SEG_LED_AEBS_OFF_L(0); SEG_LED_AEBS_OFF_L(0);
} }
} }
...@@ -900,21 +924,30 @@ uint8_t LED_LDWS_L_Judgement(void) ...@@ -900,21 +924,30 @@ uint8_t LED_LDWS_L_Judgement(void)
} }
void LED_LDWS_L_Execution(uint8_t led_status) void LED_LDWS_L_Execution(uint8_t led_status)
{ {
if (led_status == 1)
{
IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESS;
}
else
{
IS31_CHIP0_CHANNEL04 = 0x00;
}
if (led_status == 1) if (K_Line_Set.K_Line_LID28 == 0x01u)
{ {
SEG_LED_LDWS_L(7); if (led_status == 1)
{
IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESS;
}
else
{
IS31_CHIP0_CHANNEL04 = 0x00;
}
if (led_status == 1)
{
SEG_LED_LDWS_L(7);
}
else
{
SEG_LED_LDWS_L(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL04 = 0x00u;
SEG_LED_LDWS_L(0); SEG_LED_LDWS_L(0);
} }
} }
...@@ -929,6 +962,7 @@ uint8_t LED_SRS_L_Judgement(void) ...@@ -929,6 +962,7 @@ uint8_t LED_SRS_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -965,7 +999,7 @@ void LED_SRS_L_Execution(uint8_t led_status) ...@@ -965,7 +999,7 @@ void LED_SRS_L_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
L6 ENG OIL L6 ENG OIL
信号接口: 信号接口: A32 LOW
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -973,6 +1007,7 @@ uint8_t LED_ENG_OIL_L_Judgement(void) ...@@ -973,6 +1007,7 @@ uint8_t LED_ENG_OIL_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ENG_OIL); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ENG_OIL);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1006,9 +1041,10 @@ void LED_ENG_OIL_L_Execution(uint8_t led_status) ...@@ -1006,9 +1041,10 @@ void LED_ENG_OIL_L_Execution(uint8_t led_status)
SEG_LED_ENG_OIL_L(0); SEG_LED_ENG_OIL_L(0);
} }
} }
/****************************************************************************** /******************************************************************************
L7 CHARG L7 CHARG
信号接口: 信号接口: A34 LOW
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -1016,6 +1052,7 @@ uint8_t LED_CHARG_L_Judgement(void) ...@@ -1016,6 +1052,7 @@ uint8_t LED_CHARG_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_CHARGE); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_CHARGE);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1052,7 +1089,7 @@ void LED_CHARG_L_Execution(uint8_t led_status) ...@@ -1052,7 +1089,7 @@ void LED_CHARG_L_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
L8 SEAT BELT L8 SEAT BELT
信号接口: 信号接口: A30 LOW
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -1060,6 +1097,7 @@ uint8_t LED_SEAT_BELT_L_Judgement(void) ...@@ -1060,6 +1097,7 @@ uint8_t LED_SEAT_BELT_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_SEAT_BELT); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_SEAT_BELT);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1103,7 +1141,8 @@ uint8_t LED_RR_DIFF_LOCK_L_Judgement(void) ...@@ -1103,7 +1141,8 @@ uint8_t LED_RR_DIFF_LOCK_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_RR_DIFF_LOCK);
m_Condition1 = XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
{ {
...@@ -1158,14 +1197,20 @@ uint8_t LED_TPMS_L_Judgement(void) ...@@ -1158,14 +1197,20 @@ uint8_t LED_TPMS_L_Judgement(void)
m_Condition4 = (uint8_t)Get_ID_18011733_Sig_No_signal_Alarm(); m_Condition4 = (uint8_t)Get_ID_18011733_Sig_No_signal_Alarm();
m_Condition5 = (uint8_t)Get_ID_18011733_Sig_Sensor_fault_information(); m_Condition5 = (uint8_t)Get_ID_18011733_Sig_Sensor_fault_information();
if (K_Line_Set.K_Line_LID3E == 0x01u)
if ((m_Condition1 == 1u) || (m_Condition2 == 1u) || (m_Condition3 == 1u))
{ {
u8Result = 1u; if ((m_Condition1 == 1u) || (m_Condition2 == 1u) || (m_Condition3 == 1u))
} {
else if ((m_Condition4 == 1u) || (m_Condition5 == 7u) || (m_Condition5 == 8u) || (m_Condition5 == 9u)) u8Result = 1u;
{ }
u8Result = FLASH_SYNC_1Hz; else if ((m_Condition4 == 1u) || (m_Condition5 == 7u) || (m_Condition5 == 8u) || (m_Condition5 == 9u))
{
u8Result = FLASH_SYNC_1Hz;
}
else
{
u8Result = 0u;
}
} }
else else
{ {
...@@ -1176,27 +1221,35 @@ uint8_t LED_TPMS_L_Judgement(void) ...@@ -1176,27 +1221,35 @@ uint8_t LED_TPMS_L_Judgement(void)
} }
void LED_TPMS_L_Execution(uint8_t led_status) void LED_TPMS_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (K_Line_Set.K_Line_LID3E == 0x01u)
{
IS31_CHIP0_CHANNEL17 = LED_BRIGHTNESS;
}
else
{ {
IS31_CHIP0_CHANNEL17 = 0x00; if (led_status == 1)
} {
IS31_CHIP0_CHANNEL17 = LED_BRIGHTNESS;
}
else
{
IS31_CHIP0_CHANNEL17 = 0x00;
}
if (led_status == 1) if (led_status == 1)
{ {
SEG_LED_TPMS_L(7); SEG_LED_TPMS_L(7);
}
else
{
SEG_LED_TPMS_L(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL17 = 0x00u;
SEG_LED_TPMS_L(0); SEG_LED_TPMS_L(0);
} }
} }
/****************************************************************************** /******************************************************************************
L11 ASR/EVSC OFF L11 ASR/EVSC OFF
信号接口: 信号接口: 18F0010B Byte:3 Bit:3-4==01(B)
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -1204,11 +1257,19 @@ uint8_t LED_ASR_or_EVSC_OFF_L_Judgement(void) ...@@ -1204,11 +1257,19 @@ uint8_t LED_ASR_or_EVSC_OFF_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Offroad_Switch(); m_Condition1 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Offroad_Switch();
if (m_Condition1 == 1u) if (K_Line_Set.K_Line_LID22 == 0x01u)
{ {
u8Result = 1u; if (m_Condition1 == 1u)
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
} }
else else
{ {
...@@ -1219,21 +1280,29 @@ uint8_t LED_ASR_or_EVSC_OFF_L_Judgement(void) ...@@ -1219,21 +1280,29 @@ uint8_t LED_ASR_or_EVSC_OFF_L_Judgement(void)
} }
void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status) void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (K_Line_Set.K_Line_LID22 == 0x01u)
{
IS31_CHIP0_CHANNEL18 = LED_BRIGHTNESS;
}
else
{ {
IS31_CHIP0_CHANNEL18 = 0x00; if (led_status == 1)
} {
IS31_CHIP0_CHANNEL18 = LED_BRIGHTNESS;
}
else
{
IS31_CHIP0_CHANNEL18 = 0x00;
}
if (led_status == 1) if (led_status == 1)
{ {
SEG_LED_ASR_or_EVSC_OFF_L(7); SEG_LED_ASR_or_EVSC_OFF_L(7);
}
else
{
SEG_LED_ASR_or_EVSC_OFF_L(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL18 = 0x0u;
SEG_LED_ASR_or_EVSC_OFF_L(0); SEG_LED_ASR_or_EVSC_OFF_L(0);
} }
} }
...@@ -1247,6 +1316,8 @@ void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status) ...@@ -1247,6 +1316,8 @@ void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status)
uint8_t LED_EVSC_L_Judgement(void) uint8_t LED_EVSC_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t CanStatus1 = 0u;
uint8_t CanStatus2 = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u; uint8_t m_Condition2 = 0u;
uint8_t m_Condition3 = 0u; uint8_t m_Condition3 = 0u;
...@@ -1255,30 +1326,37 @@ uint8_t LED_EVSC_L_Judgement(void) ...@@ -1255,30 +1326,37 @@ uint8_t LED_EVSC_L_Judgement(void)
uint8_t m_Condition6 = 0u; uint8_t m_Condition6 = 0u;
uint8_t m_Condition7 = 0u; uint8_t m_Condition7 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE4F0B_Msg_Count);
CanStatus2 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS); /*A28*/
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State(); m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();
m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State(); m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State();
m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational(); m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();
//m_Condition6 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State();
//m_Condition7 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Offroad_Switch();
if ((m_Condition1 == 1u) || (m_Condition2 == 1u)) if (
(m_Condition1 == 1u) ||
((m_Condition2 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
((CanStatus1 == CAN_SIG_LOST) && (K_Line_Set.K_Line_LID22 == 0x01u))
)
{ {
u8Result = 1u; u8Result = 1u;
} }
else if (m_Condition3 == 1u) else if ((m_Condition3 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u))
{
u8Result = FLASH_SYNC_5Hz;
}
else if (m_Condition4 == 1u)
{ {
u8Result = FLASH_SYNC_2Hz; u8Result = FLASH_SYNC_2Hz;
} }
else if (m_Condition5 == 1u) else if (
((CanStatus2 == CAN_SIG_LOST) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
((m_Condition4 == 1u) && (K_Line_Set.K_Line_LID22 == 0x01u))
)
{ {
u8Result = FLASH_SYNC_1Hz; u8Result = FLASH_SYNC_1Hz;
} }
else if ((m_Condition5 == 1u) && (K_Line_Set.K_Line_LID22 == 0x01u))
{
u8Result = FLASH_SYNC_05Hz;
}
else else
{ {
u8Result = 0u; u8Result = 0u;
...@@ -1334,21 +1412,20 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status) ...@@ -1334,21 +1412,20 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL12 = LED_BRIGHTNESS; // 绿灯 亮 IS31_CHIP0_CHANNEL12 = LED_BRIGHTNESS; /* 绿灯 亮 */
IS31_CHIP0_CHANNEL13 = 0x00; // 黄灯 灭 IS31_CHIP0_CHANNEL13 = 0x00u; /* 黄灯 灭 */
} }
else if (led_status == 2) else if (led_status == 2)
{ {
IS31_CHIP0_CHANNEL12 = 0x00; // 绿灯 灭 IS31_CHIP0_CHANNEL12 = 0x00u; /* 绿灯 灭 */
IS31_CHIP0_CHANNEL13 = LED_BRIGHTNESS; // 黄灯 亮 IS31_CHIP0_CHANNEL13 = LED_BRIGHTNESS; /* 黄灯 亮 */
} }
else else
{ {
IS31_CHIP0_CHANNEL12 = 0x00; // 绿灯 灭 IS31_CHIP0_CHANNEL12 = 0x00u; /* 绿灯 灭 */
IS31_CHIP0_CHANNEL13 = 0x00; // 黄灯 灭 IS31_CHIP0_CHANNEL13 = 0x00u; /* 黄灯 灭 */
} }
if ((led_status == 1) || (led_status == 2)) if ((led_status == 1) || (led_status == 2))
{ {
SEG_LED_eco_stop_OFF_L(7); SEG_LED_eco_stop_OFF_L(7);
...@@ -1361,7 +1438,7 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status) ...@@ -1361,7 +1438,7 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
L14 AMT L14 AMT
信号接口: 信号接口: 无多包处理 /18EBFF03/18ECFF03 PGN:65226 DM1
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -1377,15 +1454,17 @@ uint8_t LED_AMT_L_Judgement(void) ...@@ -1377,15 +1454,17 @@ uint8_t LED_AMT_L_Judgement(void)
m_Condition1 = (uint8_t)Get_ID_18FECA03_Sig_Amber_Warning_Lamp_Status(); m_Condition1 = (uint8_t)Get_ID_18FECA03_Sig_Amber_Warning_Lamp_Status();
m_Condition2 = (uint8_t)Get_ID_18FECA03_Sig_Malfunction_indicator_Lamp(); m_Condition2 = (uint8_t)Get_ID_18FECA03_Sig_Malfunction_indicator_Lamp();
m_Condition3 = (uint8_t)Get_ID_18EBFF03_Sig_Amber_Warning_Lamp_Status();
m_Condition4 = (uint8_t)Get_ID_18EBFF03_Sig_Malfunction_indicator_Lamp();
m_Condition5 = (uint8_t)Get_ID_18ECFF03_Sig_Amber_Warning_Lamp_Status();
m_Condition6 = (uint8_t)Get_ID_18ECFF03_Sig_Malfunction_indicator_Lamp();
if ((m_Condition1 == 1u) || (m_Condition2 == 1u) || (m_Condition3 == 1u) || if (K_Line_Set.K_Line_LID41 == 0x13u)
(m_Condition4 == 1u) || (m_Condition5 == 1u) || (m_Condition6 == 1u))
{ {
u8Result = 1u; if ((m_Condition1 == 1u) || (m_Condition2 == 1u))
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
} }
else else
{ {
...@@ -1396,28 +1475,36 @@ uint8_t LED_AMT_L_Judgement(void) ...@@ -1396,28 +1475,36 @@ uint8_t LED_AMT_L_Judgement(void)
} }
void LED_AMT_L_Execution(uint8_t led_status) void LED_AMT_L_Execution(uint8_t led_status)
{ {
if (led_status == 1) if (K_Line_Set.K_Line_LID41 == 0x13u)
{
IS31_CHIP0_CHANNEL14 = LED_BRIGHTNESS;
}
else
{ {
IS31_CHIP0_CHANNEL14 = 0x00; if (led_status == 1)
} {
IS31_CHIP0_CHANNEL14 = LED_BRIGHTNESS;
}
else
{
IS31_CHIP0_CHANNEL14 = 0x00;
}
if (led_status == 1) if (led_status == 1)
{ {
SEG_LED_AMT_L(7); SEG_LED_AMT_L(7);
}
else
{
SEG_LED_AMT_L(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL14 = 0x00u;
SEG_LED_AMT_L(0); SEG_LED_AMT_L(0);
} }
} }
/****************************************************************************** /******************************************************************************
L15 WEAR IND L15 WEAR IND
信号接口: 信号接口: B38 0V B40 0V
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -1425,9 +1512,12 @@ uint8_t LED_WEAR_IND_L_Judgement(void) ...@@ -1425,9 +1512,12 @@ uint8_t LED_WEAR_IND_L_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_WEAR_IND); 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) if ((m_Condition1 == 1u) || (m_Condition2 == 0x01u))
{ {
u8Result = 1u; u8Result = 1u;
} }
...@@ -1461,7 +1551,7 @@ void LED_WEAR_IND_L_Execution(uint8_t led_status) ...@@ -1461,7 +1551,7 @@ void LED_WEAR_IND_L_Execution(uint8_t led_status)
/****************************************************************************** /******************************************************************************
R1 PARK BRAKE R1 PARK BRAKE
信号接口: 信号接口: A23 GND
信号定义: 信号定义:
输出信号: 输出信号:
******************************************************************************/ ******************************************************************************/
...@@ -1512,6 +1602,7 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status) ...@@ -1512,6 +1602,7 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status)
uint8_t LED_BRAKE_AIR_or_EBS_RED_R_Judgement(void) uint8_t LED_BRAKE_AIR_or_EBS_RED_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t CanStatus = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u; uint8_t m_Condition2 = 0u;
uint8_t m_Condition3 = 0u; uint8_t m_Condition3 = 0u;
...@@ -1520,7 +1611,12 @@ uint8_t LED_BRAKE_AIR_or_EBS_RED_R_Judgement(void) ...@@ -1520,7 +1611,12 @@ uint8_t LED_BRAKE_AIR_or_EBS_RED_R_Judgement(void)
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_ABS_Fully_Operational(); m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_ABS_Fully_Operational();
m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State(); m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
if ((m_Condition1 == 1u) || (m_Condition2 == 0u) || (m_Condition3 == 1u)) CanStatus = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
if (
(m_Condition1 == 1u) ||
((K_Line_Set.K_Line_LID21 == 0x01u) && ((m_Condition2 == 0u) || (m_Condition3 == 1u) || (CanStatus == CAN_SIG_LOST)))
)
{ {
u8Result = 1u; u8Result = 1u;
} }
...@@ -1555,6 +1651,7 @@ uint8_t LED_BRAKE_LOCK_R_Judgement(void) ...@@ -1555,6 +1651,7 @@ uint8_t LED_BRAKE_LOCK_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1599,6 +1696,7 @@ uint8_t LED_AIR_SUS_R_Judgement(void) ...@@ -1599,6 +1696,7 @@ uint8_t LED_AIR_SUS_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_AIR_SUS); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_AIR_SUS);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1643,6 +1741,7 @@ uint8_t LED_TRAILER_BRAKE_R_Judgement(void) ...@@ -1643,6 +1741,7 @@ uint8_t LED_TRAILER_BRAKE_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_BRAKE); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_BRAKE);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1687,7 +1786,8 @@ uint8_t LED_BRAKE_AIR_or_EBS_YELLOW_R_Judgement(void) ...@@ -1687,7 +1786,8 @@ uint8_t LED_BRAKE_AIR_or_EBS_YELLOW_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
//m_Condition1 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
{ {
...@@ -1731,6 +1831,7 @@ uint8_t LED_ACC_AIR_R_Judgement(void) ...@@ -1731,6 +1831,7 @@ uint8_t LED_ACC_AIR_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ACC_AIR); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ACC_AIR);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1770,12 +1871,19 @@ uint8_t LED_ABS_R_Judgement(void) ...@@ -1770,12 +1871,19 @@ uint8_t LED_ABS_R_Judgement(void)
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u; uint8_t m_Condition2 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ABS); //m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ABS);
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State(); //m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
if ((m_Condition1 == 1u) || (m_Condition2 == 1u)) if ((K_Line_Set.K_Line_LID21 == 0x02) || (K_Line_Set.K_Line_LID21 == 0x03))
{ {
u8Result = 1u; if ((m_Condition1 == 1u) || (m_Condition2 == 1u))
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
} }
else else
{ {
...@@ -1786,14 +1894,22 @@ uint8_t LED_ABS_R_Judgement(void) ...@@ -1786,14 +1894,22 @@ uint8_t LED_ABS_R_Judgement(void)
} }
void LED_ABS_R_Execution(uint8_t led_status) void LED_ABS_R_Execution(uint8_t led_status)
{ {
ABS_LED_MCU_OUT = led_status; if ((K_Line_Set.K_Line_LID21 == 0x02) || (K_Line_Set.K_Line_LID21 == 0x03))
if (led_status == 1)
{ {
SEG_LED_ABS_R(7); ABS_LED_MCU_OUT = led_status;
if (led_status == 1)
{
SEG_LED_ABS_R(7);
}
else
{
SEG_LED_ABS_R(0);
}
} }
else else
{ {
ABS_LED_MCU_OUT = 0x0u;
SEG_LED_ABS_R(0); SEG_LED_ABS_R(0);
} }
} }
...@@ -1808,6 +1924,7 @@ uint8_t LED_TRAILER_ABS_U_Judgement(void) ...@@ -1808,6 +1924,7 @@ uint8_t LED_TRAILER_ABS_U_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS);
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1824,7 +1941,7 @@ uint8_t LED_TRAILER_ABS_U_Judgement(void) ...@@ -1824,7 +1941,7 @@ uint8_t LED_TRAILER_ABS_U_Judgement(void)
void LED_TRAILER_ABS_U_Execution(uint8_t led_status) void LED_TRAILER_ABS_U_Execution(uint8_t led_status)
{ {
//U2_LED_OUT = led_status; TRAILER_ABS_LED_MCU_OUT = led_status;
if (led_status == 1) if (led_status == 1)
{ {
...@@ -1846,6 +1963,7 @@ uint8_t LED_WORKING_LAMP_U_Judgement(void) ...@@ -1846,6 +1963,7 @@ uint8_t LED_WORKING_LAMP_U_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)XXXX; m_Condition1 = (uint8_t)XXXX;
if (m_Condition1 == 1u) if (m_Condition1 == 1u)
...@@ -1890,6 +2008,7 @@ uint8_t LED_TRAILER_ABS_INFO_U_Judgement(void) ...@@ -1890,6 +2008,7 @@ uint8_t LED_TRAILER_ABS_INFO_U_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u; uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO); m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO);
if (m_Condition1 == 0x01u) if (m_Condition1 == 0x01u)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment