Commit 1a547abb authored by hu's avatar hu

按照新版功能调整功能

parent 7a8f8c34
...@@ -1017,7 +1017,7 @@ static void Seg_General_Digit_Display(uint32_t Digit, uint8_t Len, uint8_t Blank ...@@ -1017,7 +1017,7 @@ static void Seg_General_Digit_Display(uint32_t Digit, uint8_t Len, uint8_t Blank
static uint8_t wbyTestSeg = 0; static uint8_t wbyTestSeg = 0;
static uint16_t wbyTestNum; static uint16_t wbyTestNum;
static uint8_t IC_TEST = 1; static uint8_t IC_TEST = 0;
/****************************************************************************** /******************************************************************************
Seg_Display_Service 在 20MS任务中 Seg_Display_Service 在 20MS任务中
信号接口: 信号接口:
......
...@@ -355,18 +355,11 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status) ...@@ -355,18 +355,11 @@ void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL35 = LED_BRIGHTNESSG; IS31_CHIP0_CHANNEL35 = LED_BRIGHTNESSG;
}
else
{
IS31_CHIP0_CHANNEL35 = 0x00;
}
if (led_status == 1)
{
SEG_LED_FOUR_MUL_FOUR_T(7); SEG_LED_FOUR_MUL_FOUR_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL35 = 0x00;
SEG_LED_FOUR_MUL_FOUR_T(0); SEG_LED_FOUR_MUL_FOUR_T(0);
} }
} }
...@@ -400,18 +393,11 @@ void LED_EXH_BRAKE_T_Execution(uint8_t led_status) ...@@ -400,18 +393,11 @@ void LED_EXH_BRAKE_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL34 = LED_BRIGHTNESSG; IS31_CHIP0_CHANNEL34 = LED_BRIGHTNESSG;
}
else
{
IS31_CHIP0_CHANNEL34 = 0x00;
}
if (led_status == 1)
{
SEG_LED_EXH_BRAKE_T(7); SEG_LED_EXH_BRAKE_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL34 = 0x00;
SEG_LED_EXH_BRAKE_T(0); SEG_LED_EXH_BRAKE_T(0);
} }
} }
...@@ -445,18 +431,11 @@ void LED_QOS_GLOW_T_Execution(uint8_t led_status) ...@@ -445,18 +431,11 @@ void LED_QOS_GLOW_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL33 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL33 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL33 = 0x00;
}
if (led_status == 1)
{
SEG_LED_QOS_GLOW_T(7); SEG_LED_QOS_GLOW_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL33 = 0x00;
SEG_LED_QOS_GLOW_T(0); SEG_LED_QOS_GLOW_T(0);
} }
} }
...@@ -489,18 +468,11 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status) ...@@ -489,18 +468,11 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL32 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL32 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL32 = 0x00;
}
if (led_status == 1)
{
SEG_LED_HI_BEAM_T(7); SEG_LED_HI_BEAM_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL32 = 0x00;
SEG_LED_HI_BEAM_T(0); SEG_LED_HI_BEAM_T(0);
} }
} }
...@@ -572,18 +544,11 @@ void LED_MIL_T_Execution(uint8_t led_status) ...@@ -572,18 +544,11 @@ void LED_MIL_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL31 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL31 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL31 = 0x00;
}
if (led_status == 1)
{
SEG_LED_MIL_T(7); SEG_LED_MIL_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL31 = 0x00;
SEG_LED_MIL_T(0); SEG_LED_MIL_T(0);
} }
} }
...@@ -617,18 +582,11 @@ void LED_SVS_T_Execution(uint8_t led_status) ...@@ -617,18 +582,11 @@ void LED_SVS_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL30 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL30 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL30 = 0x00;
}
if (led_status == 1)
{
SEG_LED_SVS_T(7); SEG_LED_SVS_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL30 = 0x00;
SEG_LED_SVS_T(0); SEG_LED_SVS_T(0);
} }
} }
...@@ -704,13 +662,13 @@ uint8_t LED_RETARDER_T_Judgement(void) ...@@ -704,13 +662,13 @@ uint8_t LED_RETARDER_T_Judgement(void)
if (K_Line_Set.K_Line_LID41 == 0x13u) if (K_Line_Set.K_Line_LID41 == 0x13u)
{ {
if (m_Condition1 == 1u) if (m_Condition1 == 2u)
{ {
u8Result = 2u; u8Result = FLASH_SYNC_1Hz;
} }
else if (m_Condition1 == 2u) else if (m_Condition1 == 1u)
{ {
u8Result = FLASH_SYNC_1Hz; u8Result = 2u;
} }
} }
else else
...@@ -788,18 +746,11 @@ void LED_AUTO_LEVELING_T_Execution(uint8_t led_status) ...@@ -788,18 +746,11 @@ void LED_AUTO_LEVELING_T_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL25 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL25 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL25 = 0x00;
}
if (led_status == 1)
{
SEG_LED_AUTO_LEVELING_T(7); SEG_LED_AUTO_LEVELING_T(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL25 = 0x00;
SEG_LED_AUTO_LEVELING_T(0); SEG_LED_AUTO_LEVELING_T(0);
} }
} }
...@@ -833,18 +784,11 @@ void LED_ROWS_L_Execution(uint8_t led_status) ...@@ -833,18 +784,11 @@ void LED_ROWS_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL01 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL01 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL01 = 0x00;
}
if (led_status == 1)
{
SEG_LED_ROWS_L(7); SEG_LED_ROWS_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL01 = 0x00;
SEG_LED_ROWS_L(0); SEG_LED_ROWS_L(0);
} }
} }
...@@ -878,18 +822,11 @@ void LED_BSM_OFF_L_Execution(uint8_t led_status) ...@@ -878,18 +822,11 @@ void LED_BSM_OFF_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL02 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL02 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL02 = 0x00;
}
if (led_status == 1)
{
SEG_LED_BSM_OFF_L(7); SEG_LED_BSM_OFF_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL02 = 0x00;
SEG_LED_BSM_OFF_L(0); SEG_LED_BSM_OFF_L(0);
} }
} }
...@@ -906,21 +843,37 @@ uint8_t LED_AEBS_OFF_L_Judgement(void) ...@@ -906,21 +843,37 @@ uint8_t LED_AEBS_OFF_L_Judgement(void)
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;
uint8_t m_Condition4 = 0u;
uint8_t m_Condition5 = 0u;
uint8_t m_Condition6 = 0u;
uint8_t CanStatus1 = 0u;
uint8_t CanStatus2 = 0u;
uint8_t CanStatus3 = 0u;
m_Condition1 = (uint8_t)Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta(); m_Condition1 = (uint8_t)Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
m_Condition2 = (uint8_t)Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta(); m_Condition2 = (uint8_t)Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
m_Condition3 = (uint8_t)Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta(); m_Condition3 = (uint8_t)Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
if (K_Line_Set.K_Line_LID28 == 0x01u) CanStatus1 = CAN_MSG_Status(ID_CanMsg0CF02F2A_Msg_Count);
CanStatus2 = CAN_MSG_Status(ID_CanMsg0CF02FA1_Msg_Count);
CanStatus3 = CAN_MSG_Status(ID_CanMsg0CF02FA0_Msg_Count);
m_Condition4 = (uint8_t)Get_ID_18FECA2A_Sig_AebsOff();
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)
)
{ {
if ((m_Condition1 == 0x02u) || (m_Condition2 == 0x02u) || (m_Condition3 == 0x02u)) u8Result = 1u;
{ }
u8Result = 1u; else if ((m_Condition1 == 0x0Eu) || (m_Condition2 == 0x0Eu) || (m_Condition3 == 0x0Eu))
} {
else if ((m_Condition1 == 0x0Eu) || (m_Condition2 == 0x0Eu) || (m_Condition3 == 0x0Eu)) u8Result = FLASH_SYNC_1Hz;
{
u8Result = FLASH_SYNC_1Hz;
}
} }
else else
{ {
...@@ -931,30 +884,14 @@ uint8_t LED_AEBS_OFF_L_Judgement(void) ...@@ -931,30 +884,14 @@ 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 (K_Line_Set.K_Line_LID28 == 0x01u) if (led_status == 1)
{ {
if (led_status == 1) IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESSY;
{ SEG_LED_AEBS_OFF_L(7);
IS31_CHIP0_CHANNEL03 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL03 = 0x00;
}
if (led_status == 1)
{
SEG_LED_AEBS_OFF_L(7);
}
else
{
SEG_LED_AEBS_OFF_L(0);
}
} }
else else
{ {
IS31_CHIP0_CHANNEL03 = 0x01u; IS31_CHIP0_CHANNEL03 = 0x00;
SEG_LED_AEBS_OFF_L(0); SEG_LED_AEBS_OFF_L(0);
} }
} }
...@@ -979,21 +916,16 @@ uint8_t LED_LDWS_L_Judgement(void) ...@@ -979,21 +916,16 @@ uint8_t LED_LDWS_L_Judgement(void)
CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE5BE8_Msg_Count); CanStatus1 = CAN_MSG_Status(ID_CanMsg18FE5BE8_Msg_Count);
CanStatus2 = CAN_MSG_Status(ID_CanMsg18FECAE8_Msg_Count); CanStatus2 = CAN_MSG_Status(ID_CanMsg18FECAE8_Msg_Count);
if (K_Line_Set.K_Line_LID27 == 0x01u) if (
((CanStatus1 == CAN_SIG_LOST) || (m_Condition1 == 0x02u) || (m_Condition2 == 0x01u)) &&
(K_Line_Set.K_Line_LID27 == 0x01u)
)
{ {
/*LDWS与FCW同时掉线闪烁*/ u8Result = 1u;
if ((CanStatus1 == CAN_SIG_LOST) && (CanStatus2 == CAN_SIG_LOST)) }
{ else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu))
u8Result = FLASH_SYNC_1Hz; {
} u8Result = FLASH_SYNC_1Hz;
else if ((m_Condition1 == 0x00u) || (m_Condition1 == 0x05u) || (m_Condition1 == 0x0Eu))
{
u8Result = FLASH_SYNC_1Hz;
}
else if ((m_Condition1 == 0x02u) || (m_Condition2 == 0x01u))
{
u8Result = 1u;
}
} }
else else
{ {
...@@ -1004,29 +936,14 @@ uint8_t LED_LDWS_L_Judgement(void) ...@@ -1004,29 +936,14 @@ 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 (K_Line_Set.K_Line_LID28 == 0x01u) if (led_status == 1)
{ {
if (led_status == 1) IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESSY;
{ SEG_LED_LDWS_L(7);
IS31_CHIP0_CHANNEL04 = LED_BRIGHTNESSY;
}
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; IS31_CHIP0_CHANNEL04 = 0x00;
SEG_LED_LDWS_L(0); SEG_LED_LDWS_L(0);
} }
} }
...@@ -1060,18 +977,11 @@ void LED_SRS_L_Execution(uint8_t led_status) ...@@ -1060,18 +977,11 @@ void LED_SRS_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL20 = LED_BRIGHTNESSR; IS31_CHIP0_CHANNEL20 = LED_BRIGHTNESSR;
}
else
{
IS31_CHIP0_CHANNEL20 = 0x00;
}
if (led_status == 1)
{
SEG_LED_SRS_L(7); SEG_LED_SRS_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL20 = 0x00;
SEG_LED_SRS_L(0); SEG_LED_SRS_L(0);
} }
} }
...@@ -1105,18 +1015,11 @@ void LED_ENG_OIL_L_Execution(uint8_t led_status) ...@@ -1105,18 +1015,11 @@ void LED_ENG_OIL_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL21 = LED_BRIGHTNESSR; IS31_CHIP0_CHANNEL21 = LED_BRIGHTNESSR;
}
else
{
IS31_CHIP0_CHANNEL21 = 0x00;
}
if (led_status == 1)
{
SEG_LED_ENG_OIL_L(7); SEG_LED_ENG_OIL_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL21 = 0x00;
SEG_LED_ENG_OIL_L(0); SEG_LED_ENG_OIL_L(0);
} }
} }
...@@ -1150,18 +1053,11 @@ void LED_CHARG_L_Execution(uint8_t led_status) ...@@ -1150,18 +1053,11 @@ void LED_CHARG_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL22 = LED_BRIGHTNESSB; IS31_CHIP0_CHANNEL22 = LED_BRIGHTNESSB;
}
else
{
IS31_CHIP0_CHANNEL22 = 0x00;
}
if (led_status == 1)
{
SEG_LED_CHARG_L(7); SEG_LED_CHARG_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL22 = 0x00;
SEG_LED_CHARG_L(0); SEG_LED_CHARG_L(0);
} }
} }
...@@ -1195,18 +1091,11 @@ void LED_SEAT_BELT_L_Execution(uint8_t led_status) ...@@ -1195,18 +1091,11 @@ void LED_SEAT_BELT_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL23 = LED_BRIGHTNESSR; IS31_CHIP0_CHANNEL23 = LED_BRIGHTNESSR;
}
else
{
IS31_CHIP0_CHANNEL23 = 0x00;
}
if (led_status == 1)
{
SEG_LED_SEAT_BELT_L(7); SEG_LED_SEAT_BELT_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL23 = 0x00;
SEG_LED_SEAT_BELT_L(0); SEG_LED_SEAT_BELT_L(0);
} }
} }
...@@ -1239,18 +1128,11 @@ void LED_RR_DIFF_LOCK_L_Execution(uint8_t led_status) ...@@ -1239,18 +1128,11 @@ void LED_RR_DIFF_LOCK_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL16 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL16 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL16 = 0x00;
}
if (led_status == 1)
{
SEG_LED_RR_DIFF_LOCK_L(7); SEG_LED_RR_DIFF_LOCK_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL16 = 0x00;
SEG_LED_RR_DIFF_LOCK_L(0); SEG_LED_RR_DIFF_LOCK_L(0);
} }
} }
...@@ -1307,18 +1189,11 @@ void LED_TPMS_L_Execution(uint8_t led_status) ...@@ -1307,18 +1189,11 @@ void LED_TPMS_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL17 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL17 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL17 = 0x00;
}
if (led_status == 1)
{
SEG_LED_TPMS_L(7); SEG_LED_TPMS_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL17 = 0x00;
SEG_LED_TPMS_L(0); SEG_LED_TPMS_L(0);
} }
} }
...@@ -1367,18 +1242,11 @@ void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status) ...@@ -1367,18 +1242,11 @@ void LED_ASR_or_EVSC_OFF_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL18 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL18 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL18 = 0x00;
}
if (led_status == 1)
{
SEG_LED_ASR_or_EVSC_OFF_L(7); SEG_LED_ASR_or_EVSC_OFF_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL18 = 0x00;
SEG_LED_ASR_or_EVSC_OFF_L(0); SEG_LED_ASR_or_EVSC_OFF_L(0);
} }
} }
...@@ -1458,18 +1326,11 @@ void LED_EVSC_L_Execution(uint8_t led_status) ...@@ -1458,18 +1326,11 @@ void LED_EVSC_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL19 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL19 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL19 = 0x00;
}
if (led_status == 1)
{
SEG_LED_EVSC_L(7); SEG_LED_EVSC_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL19 = 0x00;
SEG_LED_EVSC_L(0); SEG_LED_EVSC_L(0);
} }
} }
...@@ -1569,18 +1430,11 @@ void LED_AMT_L_Execution(uint8_t led_status) ...@@ -1569,18 +1430,11 @@ void LED_AMT_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL14 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL14 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL14 = 0x00;
}
if (led_status == 1)
{
SEG_LED_AMT_L(7); SEG_LED_AMT_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL14 = 0x00;
SEG_LED_AMT_L(0); SEG_LED_AMT_L(0);
} }
} }
...@@ -1622,18 +1476,11 @@ void LED_WEAR_IND_L_Execution(uint8_t led_status) ...@@ -1622,18 +1476,11 @@ void LED_WEAR_IND_L_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL15 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL15 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL15 = 0x00;
}
if (led_status == 1)
{
SEG_LED_WEAR_IND_L(7); SEG_LED_WEAR_IND_L(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL15 = 0x00;
SEG_LED_WEAR_IND_L(0); SEG_LED_WEAR_IND_L(0);
} }
} }
...@@ -1666,18 +1513,11 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status) ...@@ -1666,18 +1513,11 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL08 = LED_BRIGHTNESSR; IS31_CHIP0_CHANNEL08 = LED_BRIGHTNESSR;
}
else
{
IS31_CHIP0_CHANNEL08 = 0x00;
}
if (led_status == 1)
{
SEG_LED_PARK_BRAKE_R(7); SEG_LED_PARK_BRAKE_R(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL08 = 0x00;
SEG_LED_PARK_BRAKE_R(0); SEG_LED_PARK_BRAKE_R(0);
} }
} }
...@@ -1755,18 +1595,11 @@ void LED_BRAKE_LOCK_R_Execution(uint8_t led_status) ...@@ -1755,18 +1595,11 @@ void LED_BRAKE_LOCK_R_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL07 = LED_BRIGHTNESSR; IS31_CHIP0_CHANNEL07 = LED_BRIGHTNESSR;
}
else
{
IS31_CHIP0_CHANNEL07 = 0x00;
}
if (led_status == 1)
{
SEG_LED_BRAKE_LOCK_R(7); SEG_LED_BRAKE_LOCK_R(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL07 = 0x00;
SEG_LED_BRAKE_LOCK_R(0); SEG_LED_BRAKE_LOCK_R(0);
} }
} }
...@@ -1800,18 +1633,11 @@ void LED_AIR_SUS_R_Execution(uint8_t led_status) ...@@ -1800,18 +1633,11 @@ void LED_AIR_SUS_R_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL06 = LED_BRIGHTNESSR; IS31_CHIP0_CHANNEL06 = LED_BRIGHTNESSR;
}
else
{
IS31_CHIP0_CHANNEL06 = 0x00;
}
if (led_status == 1)
{
SEG_LED_AIR_SUS_R(7); SEG_LED_AIR_SUS_R(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL06 = 0x00;
SEG_LED_AIR_SUS_R(0); SEG_LED_AIR_SUS_R(0);
} }
} }
...@@ -1827,7 +1653,7 @@ uint8_t LED_TRAILER_BRAKE_R_Judgement(void) ...@@ -1827,7 +1653,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)
{ {
...@@ -1845,18 +1671,11 @@ void LED_TRAILER_BRAKE_R_Execution(uint8_t led_status) ...@@ -1845,18 +1671,11 @@ void LED_TRAILER_BRAKE_R_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL10 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL10 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL10 = 0x00;
}
if (led_status == 1)
{
SEG_LED_TRAILER_BRAKE_R(7); SEG_LED_TRAILER_BRAKE_R(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL10 = 0x00;
SEG_LED_TRAILER_BRAKE_R(0); SEG_LED_TRAILER_BRAKE_R(0);
} }
} }
...@@ -1890,18 +1709,11 @@ void LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(uint8_t led_status) ...@@ -1890,18 +1709,11 @@ void LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL09 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL09 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL09 = 0x00;
}
if (led_status == 1)
{
SEG_LED_BRAKE_AIR_or_EBS_YELLOW_R(7); SEG_LED_BRAKE_AIR_or_EBS_YELLOW_R(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL09 = 0x00;
SEG_LED_BRAKE_AIR_or_EBS_YELLOW_R(0); SEG_LED_BRAKE_AIR_or_EBS_YELLOW_R(0);
} }
} }
...@@ -1953,22 +1765,18 @@ void LED_ACC_AIR_R_Execution(uint8_t led_status) ...@@ -1953,22 +1765,18 @@ void LED_ACC_AIR_R_Execution(uint8_t led_status)
uint8_t LED_ABS_R_Judgement(void) uint8_t LED_ABS_R_Judgement(void)
{ {
uint8_t u8Result = 0u; uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
uint8_t m_Condition2 = 0u; uint8_t m_Condition2 = 0u;
uint8_t CanStatus1 = 0u; uint8_t CanStatus1 = 0u;
m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State(); m_Condition2 = (uint8_t)Get_ID_18F0010B_Sig_EBS_Amber_Warning_State();
CanStatus1 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count); CanStatus1 = CAN_MSG_Status(ID_CanMsg18F0010B_Msg_Count);
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ABS);
if (K_Line_Set.K_Line_LID21 == 0x01) if ((((CanStatus1 == CAN_SIG_LOST) || (m_Condition2 == 1u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
(m_Condition1 == 1u) && (K_Line_Set.K_Line_LID21 == 0x03u))
{ {
if ((CanStatus1 == CAN_SIG_LOST) || (m_Condition2 == 1u)) u8Result = 1u;
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
} }
else else
{ {
...@@ -2059,18 +1867,11 @@ void LED_WORKING_LAMP_U_Execution(uint8_t led_status) ...@@ -2059,18 +1867,11 @@ void LED_WORKING_LAMP_U_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL11 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL11 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL11 = 0x00;
}
if (led_status == 1)
{
SEG_LED_WORKING_LAMP_U(7); SEG_LED_WORKING_LAMP_U(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL11 = 0x00;
SEG_LED_WORKING_LAMP_U(0); SEG_LED_WORKING_LAMP_U(0);
} }
} }
...@@ -2104,18 +1905,11 @@ void LED_TRAILER_ABS_INFO_U_Execution(uint8_t led_status) ...@@ -2104,18 +1905,11 @@ void LED_TRAILER_ABS_INFO_U_Execution(uint8_t led_status)
if (led_status == 1) if (led_status == 1)
{ {
IS31_CHIP0_CHANNEL05 = LED_BRIGHTNESSY; IS31_CHIP0_CHANNEL05 = LED_BRIGHTNESSY;
}
else
{
IS31_CHIP0_CHANNEL05 = 0x00;
}
if (led_status == 1)
{
SEG_LED_TRAILER_ABS_INFO_U(7); SEG_LED_TRAILER_ABS_INFO_U(7);
} }
else else
{ {
IS31_CHIP0_CHANNEL05 = 0x00;
SEG_LED_TRAILER_ABS_INFO_U(0); SEG_LED_TRAILER_ABS_INFO_U(0);
} }
} }
......
...@@ -56,7 +56,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -56,7 +56,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0xFFu, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u}, {0xFFu, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0xFFu, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 3000ul,
0x18FE5BE8ul, 0x18FE5BE8ul,
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
...@@ -106,7 +106,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -106,7 +106,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 3000ul,
0xCF02F2Aul, 0xCF02F2Aul,
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
...@@ -116,7 +116,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -116,7 +116,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 3000ul,
0xCF02FA1ul, 0xCF02FA1ul,
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
...@@ -126,7 +126,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -126,7 +126,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u}, {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul, 3000ul,
0xCF02FA0ul, 0xCF02FA0ul,
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
...@@ -432,6 +432,36 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] = ...@@ -432,6 +432,36 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
(( void * )0), (( void * )0),
(( void * )0), (( void * )0),
}, },
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x18FECA2Au,
(( void * )0),
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x18FECAA1u,
(( void * )0),
(( void * )0),
(( void * )0),
},
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
5000ul,
0x18FECAA0u,
(( void * )0),
(( void * )0),
(( void * )0),
},
}; };
uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void) uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void)
...@@ -981,6 +1011,21 @@ uint8_t Get_ID_18FECA03_Sig_FMI(void) ...@@ -981,6 +1011,21 @@ uint8_t Get_ID_18FECA03_Sig_FMI(void)
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 4u) >> 0u) & 0x1Fu); return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 4u) >> 0u) & 0x1Fu);
} }
uint8_t Get_ID_18FECA2A_Sig_AebsOff(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECA2A_Msg_Count, 0u) >> 2u) & 0x03u);
}
uint8_t Get_ID_18FECAA1_Sig_AebsOff(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECAA1_Msg_Count, 0u) >> 2u) & 0x03u);
}
uint8_t Get_ID_18FECAA0_Sig_AebsOff(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECAA0_Msg_Count, 0u) >> 2u) & 0x03u);
}
uint8_t Co_Can_ConvertSubID(uint32_t MsgID) uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
{ {
uint8_t u8Result = ID_TOTAL_MAX; uint8_t u8Result = ID_TOTAL_MAX;
...@@ -1109,6 +1154,15 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -1109,6 +1154,15 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case ID_CanMsg0C010305_Msg: case ID_CanMsg0C010305_Msg:
u8Result = ID_CanMsg0C010305_Msg_Count; u8Result = ID_CanMsg0C010305_Msg_Count;
break; break;
case ID_CanMsg18FECA2A_Msg:
u8Result = ID_CanMsg18FECA2A_Msg_Count;
break;
case ID_CanMsg18FECAA1_Msg:
u8Result = ID_CanMsg18FECAA1_Msg_Count;
break;
case ID_CanMsg18FECAA0_Msg:
u8Result = ID_CanMsg18FECAA0_Msg_Count;
break;
default : default :
u8Result = ID_TOTAL_MAX; u8Result = ID_TOTAL_MAX;
break; break;
......
...@@ -47,6 +47,9 @@ typedef enum ...@@ -47,6 +47,9 @@ typedef enum
ID_CanMsg18EA0021_Msg_Count, ID_CanMsg18EA0021_Msg_Count,
ID_CanMsg18021733_Msg_Count, ID_CanMsg18021733_Msg_Count,
ID_CanMsg0C010305_Msg_Count, ID_CanMsg0C010305_Msg_Count,
ID_CanMsg18FECA2A_Msg_Count,
ID_CanMsg18FECAA1_Msg_Count,
ID_CanMsg18FECAA0_Msg_Count,
ID_TOTAL_MAX, ID_TOTAL_MAX,
} CAN_MSG_ID_t; } CAN_MSG_ID_t;
...@@ -115,6 +118,9 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -115,6 +118,9 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define ID_CanMsg18EA0021_Msg 0x18EA0021u #define ID_CanMsg18EA0021_Msg 0x18EA0021u
#define ID_CanMsg18021733_Msg 0x18021733u #define ID_CanMsg18021733_Msg 0x18021733u
#define ID_CanMsg0C010305_Msg 0x0C010305u #define ID_CanMsg0C010305_Msg 0x0C010305u
#define ID_CanMsg18FECA2A_Msg 0x18FECA2Au
#define ID_CanMsg18FECAA1_Msg 0x18FECAA1u
#define ID_CanMsg18FECAA0_Msg 0x18FECAA0u
extern uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void); extern uint8_t Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State(void);
extern uint8_t Get_ID_18FF2300_Sig_EXH_System(void); extern uint8_t Get_ID_18FF2300_Sig_EXH_System(void);
...@@ -223,6 +229,9 @@ extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void); ...@@ -223,6 +229,9 @@ extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void); extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void);
extern uint32_t Get_ID_18FECA03_Sig_SPN(void); extern uint32_t Get_ID_18FECA03_Sig_SPN(void);
extern uint8_t Get_ID_18FECA03_Sig_FMI(void); extern uint8_t Get_ID_18FECA03_Sig_FMI(void);
extern uint8_t Get_ID_18FECA2A_Sig_AebsOff(void);
extern uint8_t Get_ID_18FECAA1_Sig_AebsOff(void);
extern uint8_t Get_ID_18FECAA0_Sig_AebsOff(void);
extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID); extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID);
......
...@@ -6287,10 +6287,6 @@ void GUI_General_Popup_Display(uint16_t PopupMsg) ...@@ -6287,10 +6287,6 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
} }
} }
void Loc_Display_Blue(void) void Loc_Display_Blue(void)
{ {
loc_Disable_Window_App(); loc_Disable_Window_App();
...@@ -6298,4 +6294,186 @@ void Loc_Display_Blue(void) ...@@ -6298,4 +6294,186 @@ void Loc_Display_Blue(void)
R_WM_ScreenBgColorSet(0, 0, 0, 0Xff); R_WM_ScreenBgColorSet(0, 0, 0, 0Xff);
R_WM_FrameEndMark(0, 0); R_WM_FrameEndMark(0, 0);
R_WM_FrameWait(0, 0); R_WM_FrameWait(0, 0);
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu1_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
if (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_4)
{
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_1)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_01White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_2)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_02White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_3)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1MENU_4)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else if (bCurMenuIDX == _FAC_DSP_LEVEL1MENU_5)
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_02White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_07White, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_08White, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu1_09White, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_01black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_02black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_07black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu5_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_09black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu6_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu1_06black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
} }
\ No newline at end of file
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#define FState_COilTimeOutNum 60u /*3S*/ #define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10000)) /*硬件版本号 HV:01.00.00*/ #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10000)) /*硬件版本号 HV:01.00.00*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101)) /*软件版本号 SV:01.01.00*/ #define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101)) /*软件版本号 SV:01.01.00*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(8)) /*FLASH版本号 FV:00.08*/ #define systemSupplierECUFlashInformationApp ((uint16_t)(8)) /*FLASH版本号 FV:00.08*/
typedef struct typedef struct
{ {
...@@ -163,84 +163,84 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] = ...@@ -163,84 +163,84 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{ {
/*----图标-----------------有车速-----------------------------------------------------------无车速-------------------------------------------*/ /*----图标-----------------有车速-----------------------------------------------------------无车速-------------------------------------------*/
/*----第一组----*/ /*----第一组----*/
{SpriteSize , CN_Alarm_01_wenzi1 , SpriteSize , CN_Alarm_01_wenzi1 , SpriteSize }, /*00.紧急警报-刹车*/ {SpriteSize, CN_Alarm_01_wenzi1, SpriteSize, CN_Alarm_01_wenzi1, SpriteSize}, /*00.紧急警报-刹车*/
{SpriteSize , CN_Alarm_01_wenzi4 , SpriteSize , CN_Alarm_01_wenzi4 , SpriteSize }, /*01.紧急警报-紧急制动*/ {SpriteSize, CN_Alarm_01_wenzi4, SpriteSize, CN_Alarm_01_wenzi4, SpriteSize}, /*01.紧急警报-紧急制动*/
{SpriteSize , CN_Alarm_01_wenzi2 , SpriteSize , CN_Alarm_01_wenzi2 , SpriteSize }, /*02.车间距警报-刹车(红字)*/ {SpriteSize, CN_Alarm_01_wenzi2, SpriteSize, CN_Alarm_01_wenzi2, SpriteSize}, /*02.车间距警报-刹车(红字)*/
{SpriteSize , CN_Alarm_01_wenzi5 , SpriteSize , CN_Alarm_01_wenzi5 , SpriteSize }, /*03.车间距警报-碰撞报警*/ {SpriteSize, CN_Alarm_01_wenzi5, SpriteSize, CN_Alarm_01_wenzi5, SpriteSize}, /*03.车间距警报-碰撞报警*/
{SpriteSize , CN_Alarm_01_wenzi3 , SpriteSize , CN_Alarm_01_wenzi3 , SpriteSize }, /*04.车间距警报-刹车(黄字)*/ {SpriteSize, CN_Alarm_01_wenzi3, SpriteSize, CN_Alarm_01_wenzi3, SpriteSize}, /*04.车间距警报-刹车(黄字)*/
{CN_Alarm_drive_04_image , CN_Alarm_drive_04_wenzi , SpriteSize , CN_Alarm_drive_04_wenzi , SpriteSize }, /*05.ASR工作*/ {CN_Alarm_drive_04_image, CN_Alarm_drive_04_wenzi, SpriteSize, CN_Alarm_drive_04_wenzi, SpriteSize}, /*05.ASR工作*/
/*----第二组----*/ /*----第二组----*/
{CN_Alarm_drive_05_image , CN_Alarm_drive_05_wenzi , SpriteSize , SpriteSize , SpriteSize }, /*06.PTO紧急警报-刹车*/ {CN_Alarm_drive_05_image, CN_Alarm_drive_05_wenzi, SpriteSize, SpriteSize, SpriteSize}, /*06.PTO紧急警报-刹车*/
{CN_Alarm_drive_06_image , CN_Alarm_drive_06_wenzi , SpriteSize , SpriteSize , SpriteSize }, /*07.忘记松手刹车*/ {CN_Alarm_drive_06_image, CN_Alarm_drive_06_wenzi, SpriteSize, SpriteSize, SpriteSize}, /*07.忘记松手刹车*/
{CN_Alarm_drive_10_image , CN_Alarm_drive_10_wenzi , SpriteSize , SpriteSize , SpriteSize }, /*08.遥控调整车辆高度(有车速)*/ {CN_Alarm_drive_10_image, CN_Alarm_drive_10_wenzi, SpriteSize, SpriteSize, SpriteSize}, /*08.遥控调整车辆高度(有车速)*/
/*----第三组----*/ /*----第三组----*/
{CN_Alarm_drive_12_image , CN_Alarm_drive_12_wenzi , SpriteSize , CN_Alarm_drive_12_wenzi , SpriteSize }, /*09.自动巡航模式*/ {CN_Alarm_drive_12_image, CN_Alarm_drive_12_wenzi, SpriteSize, CN_Alarm_drive_12_wenzi, SpriteSize}, /*09.自动巡航模式*/
{CN_Alarm_drive_14_image , CN_Alarm_drive_14_wenzi , SpriteSize , CN_Alarm_drive_14_wenzi , SpriteSize }, /*10.可变SLD 模式*/ {CN_Alarm_drive_14_image, CN_Alarm_drive_14_wenzi, SpriteSize, CN_Alarm_drive_14_wenzi, SpriteSize}, /*10.可变SLD 模式*/
/*----第四组----*/ /*----第四组----*/
{CN_Alarm_TST_2_image , CN_Alarm_TST_1_wenzi , SpriteSize , CN_Alarm_TST_1_wenzi , SpriteSize }, /*11.充电异常(系统检测)*/ {CN_Alarm_TST_2_image, CN_Alarm_TST_1_wenzi, SpriteSize, CN_Alarm_TST_1_wenzi, SpriteSize}, /*11.充电异常(系统检测)*/
{CN_Alarm_TST_1_image , CN_Alarm_TST_1_wenzi , SpriteSize , CN_Alarm_TST_1_wenzi , SpriteSize }, /*12.油压(系统检测)*/ {CN_Alarm_TST_1_image, CN_Alarm_TST_1_wenzi, SpriteSize, CN_Alarm_TST_1_wenzi, SpriteSize}, /*12.油压(系统检测)*/
{CN_Alarm_TST_3_image , CN_Alarm_TST_3_wenzi1 , SpriteSize , CN_Alarm_TST_3_wenzi1 , SpriteSize }, /*13.AMT初始化异常*/ {CN_Alarm_TST_3_image, CN_Alarm_TST_3_wenzi1, SpriteSize, CN_Alarm_TST_3_wenzi1, SpriteSize}, /*13.AMT初始化异常*/
{CN_Alarm_TST_5_image , CN_Alarm_TST_1_wenzi , SpriteSize , CN_Alarm_TST_1_wenzi , SpriteSize }, /*14.尿素品质异常(系统检测)*/ {CN_Alarm_TST_5_image, CN_Alarm_TST_1_wenzi, SpriteSize, CN_Alarm_TST_1_wenzi, SpriteSize}, /*14.尿素品质异常(系统检测)*/
{CN_Alarm_TST_6_image , CN_Alarm_TST_1_wenzi , SpriteSize , CN_Alarm_TST_1_wenzi , SpriteSize }, /*15.尿素喷射异常(系统检测)*/ {CN_Alarm_TST_6_image, CN_Alarm_TST_1_wenzi, SpriteSize, CN_Alarm_TST_1_wenzi, SpriteSize}, /*15.尿素喷射异常(系统检测)*/
{CN_Alarm_TST_7_image , CN_Alarm_TST_1_wenzi , SpriteSize , CN_Alarm_TST_1_wenzi , SpriteSize }, /*16.尿素水补给(系统检测)*/ {CN_Alarm_TST_7_image, CN_Alarm_TST_1_wenzi, SpriteSize, CN_Alarm_TST_1_wenzi, SpriteSize}, /*16.尿素水补给(系统检测)*/
{CN_Alarm_TST_4_image , CN_Alarm_TST_4_wenzi1 , SpriteSize , CN_Alarm_TST_4_wenzi1 , SpriteSize }, /*17.AMT初始化结束*/ {CN_Alarm_TST_4_image, CN_Alarm_TST_4_wenzi1, SpriteSize, CN_Alarm_TST_4_wenzi1, SpriteSize}, /*17.AMT初始化结束*/
{CN_Alarm_TST_8_image , CN_Alarm_TST_1_wenzi , SpriteSize , CN_Alarm_TST_1_wenzi , SpriteSize }, /*18.DPD自动再生*/ {CN_Alarm_TST_8_image, CN_Alarm_TST_1_wenzi, SpriteSize, CN_Alarm_TST_1_wenzi, SpriteSize}, /*18.DPD自动再生*/
/*----第五组----*/ /*----第五组----*/
{CN_Alarm_G5_1_image , CN_Alarm_G5_1_wenzi2 , CN_Alarm_G5_1_wenzi1 , CN_Alarm_G5_1_wenzi3 , CN_Alarm_G5_1_wenzi4 }, /*19.过热(过热,请在安全的场所停车)*/ {CN_Alarm_G5_1_image, CN_Alarm_G5_1_wenzi2, CN_Alarm_G5_1_wenzi1, CN_Alarm_G5_1_wenzi3, CN_Alarm_G5_1_wenzi4}, /*19.过热(过热,请在安全的场所停车)*/
{CN_Alarm_G5_2_image , CN_Alarm_G5_2_image2 , CN_Alarm_G5_2_wenzi1 , CN_Alarm_G5_2_wenzi , CN_Alarm_G5_2_wenzi2 },/*20.冷却水(冷却水不足)*/ {CN_Alarm_G5_2_image, CN_Alarm_G5_2_image2, CN_Alarm_G5_2_wenzi1, CN_Alarm_G5_2_wenzi, CN_Alarm_G5_2_wenzi2}, /*20.冷却水(冷却水不足)*/
{CN_Alarm_G5_3_image , CN_Alarm_G5_3_wenzi4 , CN_Alarm_G5_3_wenzi1 , CN_Alarm_G5_3_wenzi3 , CN_Alarm_G5_3_wenzi2 },/*21.油压异常*/ {CN_Alarm_G5_3_image, CN_Alarm_G5_3_wenzi4, CN_Alarm_G5_3_wenzi1, CN_Alarm_G5_3_wenzi3, CN_Alarm_G5_3_wenzi2}, /*21.油压异常*/
{CN_Alarm_G5_4_image , CN_Alarm_G5_4_wenzi1 , SpriteSize , CN_Alarm_G5_4_wenzi2 , CN_Alarm_G5_4_wenzi3 },/*22.仪表故障-请与五十铃公司联系*/ {CN_Alarm_G5_4_image, CN_Alarm_G5_4_wenzi1, SpriteSize, CN_Alarm_G5_4_wenzi2, CN_Alarm_G5_4_wenzi3}, /*22.仪表故障-请与五十铃公司联系*/
{CN_Alarm_G5_5_image , CN_Alarm_G5_5_wenzi1 , SpriteSize , CN_Alarm_G5_5_wenzi2 , CN_Alarm_G5_5_wenzi3 },/*23.通信系统-请与五十铃公司联系*/ {CN_Alarm_G5_5_image, CN_Alarm_G5_5_wenzi1, SpriteSize, CN_Alarm_G5_5_wenzi2, CN_Alarm_G5_5_wenzi3}, /*23.通信系统-请与五十铃公司联系*/
{CN_Alarm_G5_6_image , CN_Alarm_G5_6_wenzi1 , SpriteSize , CN_Alarm_G5_6_wenzi2 , SpriteSize },/*24.车速限制*/ {CN_Alarm_G5_6_image, CN_Alarm_G5_6_wenzi1, SpriteSize, CN_Alarm_G5_6_wenzi2, SpriteSize}, /*24.车速限制*/
{CN_Alarm_G5_7_image , CN_Alarm_G5_7_wenzi1 , SpriteSize , CN_Alarm_G5_7_wenzi2 , SpriteSize },/*25.扭矩限制*/ {CN_Alarm_G5_7_image, CN_Alarm_G5_7_wenzi1, SpriteSize, CN_Alarm_G5_7_wenzi2, SpriteSize}, /*25.扭矩限制*/
{CN_Alarm_G5_89_image , CN_Alarm_G5_89_wenzi4 , SpriteSize , CN_Alarm_G5_89_wenzi1 , SpriteSize },/*26.尿素品质异常*/ {CN_Alarm_G5_89_image, CN_Alarm_G5_89_wenzi4, SpriteSize, CN_Alarm_G5_89_wenzi1, SpriteSize}, /*26.尿素品质异常*/
{CN_Alarm_G5_89_image , CN_Alarm_G5_89_wenzi3 , SpriteSize , CN_Alarm_G5_89_wenzi2 , SpriteSize },/*27.临界排放故障*/ {CN_Alarm_G5_89_image, CN_Alarm_G5_89_wenzi3, SpriteSize, CN_Alarm_G5_89_wenzi2, SpriteSize}, /*27.临界排放故障*/
{CN_Alarm_G5_10_11_image , CN_Alarm_G5_10_11_wenzi5 , CN_Alarm_G5_10_11_wenzi1 , CN_Alarm_G5_10_11_wenzi5 , CN_Alarm_G5_10_11_wenzi4 },/*28.AMT异常-请重启发动机*/ {CN_Alarm_G5_10_11_image, CN_Alarm_G5_10_11_wenzi5, CN_Alarm_G5_10_11_wenzi1, CN_Alarm_G5_10_11_wenzi5, CN_Alarm_G5_10_11_wenzi4}, /*28.AMT异常-请重启发动机*/
{CN_Alarm_G5_10_11_image , CN_Alarm_G5_10_11_wenzi2 , SpriteSize , CN_Alarm_G5_10_11_wenzi3 , SpriteSize },/*29.AMT异常(气压低下)*/ {CN_Alarm_G5_10_11_image, CN_Alarm_G5_10_11_wenzi2, SpriteSize, CN_Alarm_G5_10_11_wenzi3, SpriteSize}, /*29.AMT异常(气压低下)*/
{CN_Alarm_G5_12_25_image , CN_Alarm_G5_12_25_wenzi1 , SpriteSize , CN_Alarm_G5_12_25_wenzi1 , SpriteSize },/*30.胎压报警-快速漏气*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi1, SpriteSize, CN_Alarm_G5_12_25_wenzi1, SpriteSize}, /*30.胎压报警-快速漏气*/
{CN_Alarm_G5_13_14_image , CN_Alarm_G5_13_14_wenzi5 , SpriteSize , CN_Alarm_G5_13_14_wenzi2 , SpriteSize },/*31.尿素补给-补充尿素溶液*/ {CN_Alarm_G5_13_14_image, CN_Alarm_G5_13_14_wenzi5, SpriteSize, CN_Alarm_G5_13_14_wenzi2, SpriteSize}, /*31.尿素补给-补充尿素溶液*/
{CN_Alarm_G5_13_14_image , CN_Alarm_G5_13_14_wenzi , SpriteSize , CN_Alarm_G5_13_14_wenzi1 , SpriteSize },/*32.尿素余量少-无车速*/ {CN_Alarm_G5_13_14_image, CN_Alarm_G5_13_14_wenzi, SpriteSize, CN_Alarm_G5_13_14_wenzi1, SpriteSize}, /*32.尿素余量少-无车速*/
{CN_Alarm_G5_12_25_image , CN_Alarm_G5_12_25_wenzi2 , SpriteSize , CN_Alarm_G5_12_25_wenzi2 , SpriteSize },/*33.胎压报警-气压低*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi2, SpriteSize, CN_Alarm_G5_12_25_wenzi2, SpriteSize}, /*33.胎压报警-气压低*/
{CN_Alarm_G5_16_image , CN_Alarm_G5_16_wenzi1 , SpriteSize , CN_Alarm_G5_16_wenzi2 , CN_Alarm_G5_16_wenzi3 },/*34.摄像头有污染-请与五十铃公司联系*/ {CN_Alarm_G5_16_image, CN_Alarm_G5_16_wenzi1, SpriteSize, CN_Alarm_G5_16_wenzi2, CN_Alarm_G5_16_wenzi3}, /*34.摄像头有污染-请与五十铃公司联系*/
{CN_Alarm_G5_17_18_21_image, CN_Alarm_G5_17_18_21_wenzi1, SpriteSize , CN_Alarm_G5_17_18_21_wenzi2, SpriteSize },/*35.尿素喷射异常(停止)*/ {CN_Alarm_G5_17_18_21_image, CN_Alarm_G5_17_18_21_wenzi1, SpriteSize, CN_Alarm_G5_17_18_21_wenzi2, SpriteSize}, /*35.尿素喷射异常(停止)*/
{CN_Alarm_G5_17_18_21_image, CN_Alarm_G5_17_18_21_wenzi3, SpriteSize , CN_Alarm_G5_17_18_21_wenzi5, SpriteSize },/*36.尿素喷射异常(消耗量)*/ {CN_Alarm_G5_17_18_21_image, CN_Alarm_G5_17_18_21_wenzi3, SpriteSize, CN_Alarm_G5_17_18_21_wenzi5, SpriteSize}, /*36.尿素喷射异常(消耗量)*/
{CN_Alarm_G5_12_25_image , CN_Alarm_G5_12_25_wenzi4 , SpriteSize , CN_Alarm_G5_12_25_wenzi4 , SpriteSize },/*37.高圧警報-轮胎高压警告*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi4, SpriteSize, CN_Alarm_G5_12_25_wenzi4, SpriteSize}, /*37.高圧警報-轮胎高压警告*/
{CN_Alarm_G5_12_25_image , CN_Alarm_G5_12_25_wenzi9 , SpriteSize , CN_Alarm_G5_12_25_wenzi9 , SpriteSize },/*38.高温警報-轮胎高温警告*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi9, SpriteSize, CN_Alarm_G5_12_25_wenzi9, SpriteSize}, /*38.高温警報-轮胎高温警告*/
{CN_Alarm_G5_12_23_image , CN_Alarm_G5_12_23_wenzi2 , SpriteSize , CN_Alarm_G5_12_23_wenzi1 , SpriteSize },/*39.DPD手动再生要求1-请按下DPD开关*/ {CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39.DPD手动再生要求1-请按下DPD开关*/
{CN_Alarm_G5_12_23_image , CN_Alarm_G5_12_23_wenzi2 , SpriteSize , CN_Alarm_G5_12_23_wenzi1 , SpriteSize },/*40.DPD手动再生要求2-请按下DPD开关*/ {CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*40.DPD手动再生要求2-请按下DPD开关*/
{CN_Alarm_G5_12_25_image , CN_Alarm_G5_12_25_wenzi7 , SpriteSize , CN_Alarm_G5_12_25_wenzi7 , SpriteSize },/*41.TPMS故障*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi7, SpriteSize, CN_Alarm_G5_12_25_wenzi7, SpriteSize}, /*41.TPMS故障*/
{CN_Alarm_G5_12_25_image , CN_Alarm_G5_12_25_wenzi6 , SpriteSize , CN_Alarm_G5_12_25_wenzi6 , SpriteSize },/*42.TPMS電池低下-轮胎监控传感器电压下降*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi6, SpriteSize, CN_Alarm_G5_12_25_wenzi6, SpriteSize}, /*42.TPMS電池低下-轮胎监控传感器电压下降*/
/*----第六组----*/ /*----第六组----*/
{CN_Alarm_stop_31_image , SpriteSize , SpriteSize , CN_Alarm_stop_31_wenzi1 , SpriteSize },/*43.遥控车辆高度调整中(无车速)*/ {CN_Alarm_stop_31_image, SpriteSize, SpriteSize, CN_Alarm_stop_31_wenzi1, SpriteSize}, /*43.遥控车辆高度调整中(无车速)*/
{CN_Alarm_stop_32_image , SpriteSize , SpriteSize , CN_Alarm_stop_32_wenzi , SpriteSize },/*44.PTO(停车中)*/ {CN_Alarm_stop_32_image, SpriteSize, SpriteSize, CN_Alarm_stop_32_wenzi, SpriteSize}, /*44.PTO(停车中)*/
/*----第七组----*/ /*----第七组----*/
{CN_Alarm_drive_33_image , CN_Alarm_drive_33_wenzi2 , CN_Alarm_drive_33_wenzi1 , CN_Alarm_stop_36_wenzi1 , CN_Alarm_stop_36_wenzi2 },/*45.充电异常-请与五十铃公司联系*/ {CN_Alarm_drive_33_image, CN_Alarm_drive_33_wenzi2, CN_Alarm_drive_33_wenzi1, CN_Alarm_stop_36_wenzi1, CN_Alarm_stop_36_wenzi2}, /*45.充电异常-请与五十铃公司联系*/
{CN_Alarm_drive_55_image , CN_Alarm_drive_55_wenzi1_1 , CN_Alarm_drive_55_wenzi1_2, CN_Alarm_drive_55_wenzi1_1 , CN_Alarm_stop_55_wenzi1_2},/*46.AMT異常-请联系经销商*/ {CN_Alarm_drive_55_image, CN_Alarm_drive_55_wenzi1_1, CN_Alarm_drive_55_wenzi1_2, CN_Alarm_drive_55_wenzi1_1, CN_Alarm_stop_55_wenzi1_2}, /*46.AMT異常-请联系经销商*/
/*----第八组----*/ /*----第八组----*/
{CN_Alarm_drive_37_image , CN_Alarm_drive_37_wenzi , SpriteSize , CN_Alarm_drive_37_wenzi , SpriteSize },/*47.补充燃料-油箱单位*/ {CN_Alarm_drive_37_image, CN_Alarm_drive_37_wenzi, SpriteSize, CN_Alarm_drive_37_wenzi, SpriteSize}, /*47.补充燃料-油箱单位*/
{CN_Alarm_drive_56_image , CN_Alarm_drive_56_wenzi1 , SpriteSize , CN_Alarm_stop_56_wenzi1_1 , CN_Alarm_stop_56_wenzi1_2},/*48.AMT过热-选择合适的档位*/ {CN_Alarm_drive_56_image, CN_Alarm_drive_56_wenzi1, SpriteSize, CN_Alarm_stop_56_wenzi1_1, CN_Alarm_stop_56_wenzi1_2}, /*48.AMT过热-选择合适的档位*/
{CN_Alarm_drive_56_image , CN_Alarm_drive_56_wenzi2 , SpriteSize , CN_Alarm_drive_56_wenzi2 , SpriteSize },/*49.AMT磨耗-离合器磨损*/ {CN_Alarm_drive_56_image, CN_Alarm_drive_56_wenzi2, SpriteSize, CN_Alarm_drive_56_wenzi2, SpriteSize}, /*49.AMT磨耗-离合器磨损*/
{CN_Alarm_drive_33_image , CN_Alarm_drive_39_wenzi1 , SpriteSize , CN_Alarm_drive_39_wenzi1 , SpriteSize },/*50.低电压报警*/ {CN_Alarm_drive_33_image, CN_Alarm_drive_39_wenzi1, SpriteSize, CN_Alarm_drive_39_wenzi1, SpriteSize}, /*50.低电压报警*/
{CN_Alarm_drive_33_image , CN_Alarm_drive_39_wenzi2 , SpriteSize , CN_Alarm_drive_39_wenzi2 , SpriteSize },/*51.过电压报警*/ {CN_Alarm_drive_33_image, CN_Alarm_drive_39_wenzi2, SpriteSize, CN_Alarm_drive_39_wenzi2, SpriteSize}, /*51.过电压报警*/
{CN_Alarm_drive_70_image , CN_Alarm_drive_70_wenzi1 , SpriteSize , CN_Alarm_stop_71_wenzi1_1 , CN_Alarm_stop_70_wenzi2 },/*52.后蹄片磨损*/ {CN_Alarm_drive_70_image, CN_Alarm_drive_70_wenzi1, SpriteSize, CN_Alarm_stop_71_wenzi1_1, CN_Alarm_stop_70_wenzi2}, /*52.后蹄片磨损*/
{CN_Alarm_drive_70_image , CN_Alarm_drive_70_wenzi1 , SpriteSize , CN_Alarm_stop_70_wenzi1_1 , CN_Alarm_stop_70_wenzi2 },/*53.前蹄片磨损*/ {CN_Alarm_drive_70_image, CN_Alarm_drive_70_wenzi1, SpriteSize, CN_Alarm_stop_70_wenzi1_1, CN_Alarm_stop_70_wenzi2}, /*53.前蹄片磨损*/
{CN_Alarm_drive_41_image , CN_Alarm_drive_41_wenzi , SpriteSize , CN_Alarm_stop_43_wenzi1 , CN_Alarm_stop_43_wenzi2 },/*54.DPD自动再生-再生将自动完成,不需要操作开关*/ {CN_Alarm_drive_41_image, CN_Alarm_drive_41_wenzi, SpriteSize, CN_Alarm_stop_43_wenzi1, CN_Alarm_stop_43_wenzi2}, /*54.DPD自动再生-再生将自动完成,不需要操作开关*/
/*----第九组----*/ /*----第九组----*/
{CN_Alarm_drive_42_image , CN_Alarm_drive_42_wenzi1 , SpriteSize , CN_Alarm_stop_44_wenzi1_1 , CN_Alarm_stop_44_wenzi1_2},/*55.气压过低-请冲入空气*/ {CN_Alarm_drive_42_image, CN_Alarm_drive_42_wenzi1, SpriteSize, CN_Alarm_stop_44_wenzi1_1, CN_Alarm_stop_44_wenzi1_2}, /*55.气压过低-请冲入空气*/
{CN_Alarm_drive_42_image , CN_Alarm_drive_42_wenzi2_2 , CN_Alarm_drive_42_wenzi2_1, CN_Alarm_stop_44_wenzi2_1 , CN_Alarm_stop_44_wenzi2_2},/*56.EBS故障(红)-请与五十铃公司联系*/ {CN_Alarm_drive_42_image, CN_Alarm_drive_42_wenzi2_2, CN_Alarm_drive_42_wenzi2_1, CN_Alarm_stop_44_wenzi2_1, CN_Alarm_stop_44_wenzi2_2}, /*56.EBS故障(红)-请与五十铃公司联系*/
/*----第十组----*/ /*----第十组----*/
{CN_Alarm_drive_43_image , CN_Alarm_drive_43_wenzi1 , SpriteSize , SpriteSize , SpriteSize },/*57.省油耗建议-急加速*/ {CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi1, SpriteSize, SpriteSize, SpriteSize}, /*57.省油耗建议-急加速*/
{CN_Alarm_drive_43_image , CN_Alarm_drive_43_wenzi2 , SpriteSize , SpriteSize , SpriteSize },/*58.省油耗建议-急减速*/ {CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi2, SpriteSize, SpriteSize, SpriteSize}, /*58.省油耗建议-急减速*/
{CN_Alarm_drive_43_image , CN_Alarm_drive_43_wenzi3 , SpriteSize , SpriteSize , SpriteSize },/*59.省油耗建议-请降低发动机转速*/ {CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi3, SpriteSize, SpriteSize, SpriteSize}, /*59.省油耗建议-请降低发动机转速*/
{CN_Alarm_drive_43_image , CN_Alarm_drive_43_wenzi4 , SpriteSize , SpriteSize , SpriteSize },/*60.省油耗建议-请降低速度*/ {CN_Alarm_drive_43_image, CN_Alarm_drive_43_wenzi4, SpriteSize, SpriteSize, SpriteSize}, /*60.省油耗建议-请降低速度*/
/*----第十一组----*/ /*----第十一组----*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi1_1 , CN_Alarm_drive_44_wenzi1 , CN_Alarm_drive_44_wenzi1_1 , CN_Alarm_drive_44_wenzi1 },/*61.发动机机油&滤清器*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_1, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_1, CN_Alarm_drive_44_wenzi1}, /*61.发动机机油&滤清器*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi1_2 , CN_Alarm_drive_44_wenzi1 , CN_Alarm_drive_44_wenzi1_2 , CN_Alarm_drive_44_wenzi1 },/*62.燃油滤清器*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_2, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_2, CN_Alarm_drive_44_wenzi1}, /*62.燃油滤清器*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi1_3 , CN_Alarm_drive_44_wenzi1 , CN_Alarm_drive_44_wenzi1_3 , CN_Alarm_drive_44_wenzi1 },/*63.变速箱油*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_3, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_3, CN_Alarm_drive_44_wenzi1}, /*63.变速箱油*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi1_4 , CN_Alarm_drive_44_wenzi1 , CN_Alarm_drive_44_wenzi1_4 , CN_Alarm_drive_44_wenzi1 },/*64.差速器油*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_4, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_4, CN_Alarm_drive_44_wenzi1}, /*64.差速器油*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi1_7 , CN_Alarm_drive_44_wenzi1 , CN_Alarm_drive_44_wenzi1_7 , CN_Alarm_drive_44_wenzi1 },/*65.顺畅系统离合器油*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_7, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_7, CN_Alarm_drive_44_wenzi1}, /*65.顺畅系统离合器油*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi1_5 , CN_Alarm_drive_44_wenzi1 , CN_Alarm_drive_44_wenzi1_5 , CN_Alarm_drive_44_wenzi1 },/*66.动力转向液*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi1_5, CN_Alarm_drive_44_wenzi1, CN_Alarm_drive_44_wenzi1_5, CN_Alarm_drive_44_wenzi1}, /*66.动力转向液*/
{CN_Alarm_drive_44_image , CN_Alarm_drive_44_wenzi2_1 , CN_Alarm_drive_44_wenzi2 , CN_Alarm_drive_44_wenzi2_1 , CN_Alarm_drive_44_wenzi2 },/*67.更换轮胎・轮胎位置*/ {CN_Alarm_drive_44_image, CN_Alarm_drive_44_wenzi2_1, CN_Alarm_drive_44_wenzi2, CN_Alarm_drive_44_wenzi2_1, CN_Alarm_drive_44_wenzi2}, /*67.更换轮胎・轮胎位置*/
}; };
static const uint32_t GUIWedk[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu}; static const uint32_t GUIWedk[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
...@@ -410,6 +410,13 @@ void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode); /**/ ...@@ -410,6 +410,13 @@ void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/ void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/
void GUI_BG_User_Light1_Display(uint8_t Mode); /**/ void GUI_BG_User_Light1_Display(uint8_t Mode); /**/
void GUI_BG_User_Light2_Display(uint8_t Mode); /**/ void GUI_BG_User_Light2_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu_Display(uint8_t Mode); /*工厂模式*/
void GUI_BG_FacMenu1_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu2_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu3_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu4_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu5_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu6_Display(uint8_t Mode); /**/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
......
...@@ -510,4 +510,44 @@ EXTERN_MEU_PROCESS void Level_Return_Menu_Enter(void); ...@@ -510,4 +510,44 @@ EXTERN_MEU_PROCESS void Level_Return_Menu_Enter(void);
EXTERN_MEU_PROCESS void Level_Return_Menu_Do(void); EXTERN_MEU_PROCESS void Level_Return_Menu_Do(void);
EXTERN_MEU_PROCESS void Level_Return_Menu_Exit(void); EXTERN_MEU_PROCESS void Level_Return_Menu_Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void);
#endif #endif
...@@ -120,17 +120,17 @@ const _MenuOptTab MenuOptTab[] = ...@@ -120,17 +120,17 @@ const _MenuOptTab MenuOptTab[] =
/*78*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_4, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*78*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_5_MENU_4, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*工厂模式*/ /*工厂模式*/
/*79*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*79*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit},
/*80*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*80*/{ _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*81*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*81*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit},
/*82*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*82*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit},
/*83*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*83*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit},
/*84*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*84*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit},
/*85*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*85*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*86*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*86*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*87*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*87*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
/*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit}, /*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, Level3_5Menu_4Enter, Level3_5Menu_4Do, Level3_5Menu_4Exit},
...@@ -1586,4 +1586,118 @@ void Level_Return_Menu_Do(void) ...@@ -1586,4 +1586,118 @@ void Level_Return_Menu_Do(void)
void Level_Return_Menu_Exit(void) void Level_Return_Menu_Exit(void)
{ {
State_Flag.ENTER_RETURN = 0; State_Flag.ENTER_RETURN = 0;
} }
\ No newline at end of file
/*----工厂模式----*/
/*----工厂模式----DTC显示-----*/
void LevelF1Menu_1Enter(void)
{}
void LevelF1Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu1_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_1Exit(void)
{}
/*----工厂模式----DTC清除-----*/
void LevelF1Menu_2Enter(void)
{}
void LevelF1Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu2_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_2Exit(void)
{}
/*----工厂模式----仪表设定显示-----*/
void LevelF1Menu_3Enter(void)
{}
void LevelF1Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu3_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_3Exit(void)
{}
/*----工厂模式----D暂时通常模式-----*/
void LevelF1Menu_4Enter(void)
{}
void LevelF1Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_4Exit(void)
{}
/*----工厂模式----结束工厂模式-----*/
void LevelF1Menu_5Enter(void)
{}
void LevelF1Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu5_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_5Exit(void)
{}
/*----工厂模式----HID自动水平初始化-----*/
void LevelF1Menu_6Enter(void)
{}
void LevelF1Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacMenu6_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1Menu_6Exit(void)
{}
/**/
/*----工厂模式----DTC显示----发动机故障*-----*/
void LevelF1_1Menu_1Enter(void)
{}
void LevelF1_1Menu_1Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_1Exit(void)
{}
/*----工厂模式----DTC显示----SCR系统故障*-----*/
void LevelF1_1Menu_2Enter(void)
{}
void LevelF1_1Menu_2Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_2Exit(void)
{}
/*----工厂模式----DTC显示----EBS/ABS故障*-----*/
void LevelF1_1Menu_3Enter(void)
{}
void LevelF1_1Menu_3Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_3Exit(void)
{}
/*----工厂模式----DTC显示----仪表故障*-----*/
void LevelF1_1Menu_4Enter(void)
{}
void LevelF1_1Menu_4Do(void)
{
GUI_OftenShow_Display();
}
void LevelF1_1Menu_4Exit(void)
{}
\ No newline at end of file
...@@ -79,34 +79,34 @@ typedef struct ...@@ -79,34 +79,34 @@ typedef struct
static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] = static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
{ {
/*================================================================================================ /*================================================================================================
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms) 音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
------------------------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------------------------*/
{/*00 SND_SRC_Key_Notremoved */ 0x01u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000U, },/*00 1HZ 忘拔钥匙 */ {/*00 SND_SRC_Key_Notremoved */ 0x03u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*00 1HZ 4 忘拔钥匙 */
{/*01 SND_SRC_Braking */ 0x02u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*01 连续 制动 */ {/*01 SND_SRC_Braking */ 0x00u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*01 连续 1 制动 */
{/*02 SND_SRC_Air_Brake */ 0x03u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*02 连续 制动气压 */ {/*02 SND_SRC_Air_Brake */ 0x01u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*02 连续 2 制动气压 */
{/*03 SND_SRC_BRAKE_LOCK */ 0x04u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*03 BRAKE LOCK */ {/*03 SND_SRC_BRAKE_LOCK */ 0x04u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*03 BRAKE LOCK */
{/*04 SND_SRC_Parking_Brake */ 0x05u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*04 停车制动忘记复位*/ {/*04 SND_SRC_Parking_Brake */ 0x05u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*04 停车制动忘记复位*/
{/*05 SND_SRC_Car_Dump_SPEED */ 0x06u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*05 车厢报警自卸蜂鸣器*/ {/*05 SND_SRC_Car_Dump_SPEED */ 0x06u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*05 车厢报警自卸蜂鸣器*/
{/*06 SND_SRC_Temp_High */ 0x07u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*06 连续 水温过热 */ {/*06 SND_SRC_Temp_High */ 0x01u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*06 连续 2 水温过热 */
{/*07 SND_SRC_Coolant_Low */ 0x08u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*07 连续 冷却水量 */ {/*07 SND_SRC_Coolant_Low */ 0x00u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*07 连续 1 冷却水量 */
{/*08 SND_SRC_Oil_pressure_Low*/ 0x09u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*08 -(预留:油压)*/ {/*08 SND_SRC_Oil_pressure_Low*/ 0x09u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*08 -(预留:油压)*/
{/*09 SND_SRC_ACC_AIR */ 0x0au, 10, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*09 连续 ACC AIR */ {/*09 SND_SRC_ACC_AIR */ 0x01u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*09 连续 2 ACC AIR */
{/*10 SND_SRC_BackUP_SPEED */ 0x0bu, 11, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000U, },/*10 1HZ 倒车警报 */ {/*10 SND_SRC_BackUP_SPEED */ 0x04u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*10 1HZ 5 倒车警报 */
{/*11 SND_SRC_DS_SPEED */ 0x00u, 12, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*11 DS 警报 */ {/*11 SND_SRC_DS_SPEED */ 0x00u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*11 DS 警报 */
{/*12 SND_SRC_ROWS_SPEED */ 0x00u, 13, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*12 ROWS 警报 */ {/*12 SND_SRC_ROWS_SPEED */ 0x00u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ 0x00u, 14, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*13 Roll 警报 */ {/*13 SND_SRC_Roll_SPEED */ 0x00u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ 0x00u, 15, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*14 4HZ EVSC */ {/*14 SND_SRC_EVSC_SPEED */ 0x01u, 5, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*14 4HZ 2 EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x00u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*15 1HZ 3 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x00u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*15 2HZ 3 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x00u, 16, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*15 4HZ 3 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 6, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*15 4HZ 4 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*16 NEES */ {/*16 SND_SRC_NEES */ 0x00u, 7, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*17 eco stop */ {/*17 SND_SRC_ECO_STOP */ 0x00u, 8, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x00u, 19, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*18 4HZ 气悬车高调整 */ {/*18 SND_SRC_Cyclone_High */ 0x03u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },/*18 4HZ 4 气悬车高调整 */
{/*18 SND_SRC_Cyclone_High */ 0x00u, 19, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*18 0.5HZ 气悬车高调整 */ {/*18 SND_SRC_Cyclone_High */ 0x03u, 9, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 2000u, },/*18 0.5HZ 4 气悬车高调整 */
{/*19 SND_SRC_SEATBELT_SPEED */ 0x00u, 20, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*19 2HZ 安全带 */ {/*19 SND_SRC_SEATBELT_SPEED */ 0x02u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },/*19 2HZ 3 安全带 */
{/*20 SND_SRC_Fuel_Saving */ 0x00u, 21, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 100U, },/*20 1HZ省油耗建议 */ {/*20 SND_SRC_Fuel_Saving */ 0x03u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*20 1HZ 4 省油耗建议 */
{/*21 SND_SRC_TICK */ 0x05u, 22, 1, SND_MODE_SINGLE, 100U, }, {/*21 SND_SRC_TICK */ 0x0Du, 2, 1, SND_MODE_SINGLE, 100u, },
{/*22 SND_SRC_TOCK */ 0x06u, 23, 1, SND_MODE_SINGLE, 100U, }, {/*22 SND_SRC_TOCK */ 0x0Eu, 3, 1, SND_MODE_SINGLE, 100u, },
/*==============================================================================================*/ /*==============================================================================================*/
}; };
......
...@@ -37,6 +37,151 @@ typedef struct ...@@ -37,6 +37,151 @@ typedef struct
******************************************************************************/ ******************************************************************************/
static const SndTrackStruct SndTracks[] = static const SndTrackStruct SndTracks[] =
{ {
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
000 | 1000ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
001 | 500ms | BUZZER_Track_Index_2300hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
002 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 280, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
003 | 500ms | BUZZER_Track_Index_2300hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 280, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
004 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 3900, 190, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
005 | 500ms | BUZZER_Track_Index_2600hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2600, 167, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
006 | 500ms | BUZZER_Track_Index_2000hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2000, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
007 | 500ms | BUZZER_Track_Index_800hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 500, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{ {
/*============================================================== /*==============================================================
音轨编号 | 总长度 | 描述 音轨编号 | 总长度 | 描述
......
...@@ -140,9 +140,9 @@ void Sys_Run_Mode_10ms_Tasks(void) ...@@ -140,9 +140,9 @@ void Sys_Run_Mode_10ms_Tasks(void)
Data_Mileage_Write_EEPROM(); Data_Mileage_Write_EEPROM();
Line_In_Debounce_Service(); Line_In_Debounce_Service();
Popup_Alone_Sound_Server(); Popup_Alone_Sound_Server();
//Telltales_Left_Right_Management_Service(); Telltales_Left_Right_Management_Service();
//Telltales_Management(); Telltales_Management();
Test_LED_AllLight(); //Test_LED_AllLight();
Key_Service(); Key_Service();
CAN_BUSOFF_Recover(); CAN_BUSOFF_Recover();
......
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