Commit 328eadc3 authored by hu's avatar hu

调整故障码显示逻辑

parent 0c17d9cd
This diff is collapsed.
...@@ -252,10 +252,13 @@ static const uint32_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu, ...@@ -252,10 +252,13 @@ static const uint32_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu,
static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6, static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6,
CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12 CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12
}; };
static const uint32_t GUIMETERY[5] = {Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, CN_Fty_Menu2_08_A}; static const uint32_t GUIMETERY[5u] = {Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, CN_Fty_Menu2_08_A};
static const uint32_t GUIMETERYNUM[16] = {Nb_15_0, Nb_15_1, Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, Nb_15_6, Nb_15_7, static const uint32_t GUIMETERYNUM[16u] = {Nb_15_0, Nb_15_1, Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, Nb_15_6, Nb_15_7,
Nb_15_8, Nb_15_9, CN_Fty_Menu2_08_A, CN_Fty_Menu2_08_B, CN_Fty_Menu2_08_C, CN_Fty_Menu2_08_D, CN_Fty_Menu2_08_E, CN_Fty_Menu2_08_F Nb_15_8, Nb_15_9, CN_Fty_Menu2_08_A, CN_Fty_Menu2_08_B, CN_Fty_Menu2_08_C, CN_Fty_Menu2_08_D, CN_Fty_Menu2_08_E, CN_Fty_Menu2_08_F
}; };
static const uint32_t GUIDTCNUM[16u] = {CN_Nb_28_0, CN_Nb_28_1, CN_Nb_28_2, CN_Nb_28_3, CN_Nb_28_4, CN_Nb_28_5, CN_Nb_28_6, CN_Nb_28_7, CN_Nb_28_8, CN_Nb_28_9,
CN_Alarm_Fault_A, CN_Alarm_Fault_B, CN_Alarm_Fault_C, CN_Alarm_Fault_D, CN_Alarm_Fault_E, CN_Alarm_Fault_F
};
static const uint16_t GUI_DISP_LEMPY[4] = {92u, 158u, 225u, 291u}; static const uint16_t GUI_DISP_LEMPY[4] = {92u, 158u, 225u, 291u};
static const uint16_t GUI_DISP_AC_TEMP[2] = {229u, 216u}; /*室外温度数字显示*/ static const uint16_t GUI_DISP_AC_TEMP[2] = {229u, 216u}; /*室外温度数字显示*/
...@@ -444,8 +447,8 @@ void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2 ...@@ -444,8 +447,8 @@ void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2
void GUI_BG_FacDTCClear3_Display(uint8_t Mode); /*工厂模式清除DTC2*/ void GUI_BG_FacDTCClear3_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacDTCClear4_Display(uint8_t Mode); /*工厂模式清除DTC2*/ void GUI_BG_FacDTCClear4_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacMeter_Display(uint8_t Mode); /*工厂模式仪表显示*/ void GUI_BG_FacMeter_Display(uint8_t Mode); /*工厂模式仪表显示*/
void GUI_BG_FacHIDAutoInit1_Display(uint8_t Mode); void GUI_BG_FacHIDAutoInit1_Display(uint8_t Mode); /**/
void GUI_BG_FacHIDAutoInit2_Display(uint8_t Mode); void GUI_BG_FacHIDAutoInit2_Display(uint8_t Mode); /**/
void GUI_BG_FacMeterExit_Display(uint8_t Mode); /*工厂模式是否结束工厂模式*/ void GUI_BG_FacMeterExit_Display(uint8_t Mode); /*工厂模式是否结束工厂模式*/
void GUI_DeaMenu_Display(uint8_t Mode); /*经销商模式MENU*/ void GUI_DeaMenu_Display(uint8_t Mode); /*经销商模式MENU*/
void GUI_BG_DeaMenu_Display(uint8_t Mode); /*经销商模式*/ void GUI_BG_DeaMenu_Display(uint8_t Mode); /*经销商模式*/
...@@ -460,8 +463,8 @@ void GUI_BG_DeaDTCClear2_Display(uint8_t Mode); /*经销商模式清除D ...@@ -460,8 +463,8 @@ void GUI_BG_DeaDTCClear2_Display(uint8_t Mode); /*经销商模式清除D
void GUI_BG_DeaDTCClear3_Display(uint8_t Mode); /*经销商模式清除DTC3*/ void GUI_BG_DeaDTCClear3_Display(uint8_t Mode); /*经销商模式清除DTC3*/
void GUI_BG_DeaDTCClear4_Display(uint8_t Mode); /*经销商模式清除DTC4*/ void GUI_BG_DeaDTCClear4_Display(uint8_t Mode); /*经销商模式清除DTC4*/
void GUI_BG_DeaMeter_Display(uint8_t Mode); /*经销商模式仪表显示*/ void GUI_BG_DeaMeter_Display(uint8_t Mode); /*经销商模式仪表显示*/
void GUI_BG_DeaHIDAutoInit1_Display(uint8_t Mode); void GUI_BG_DeaHIDAutoInit1_Display(uint8_t Mode); /**/
void GUI_BG_DeaHIDAutoInit2_Display(uint8_t Mode); void GUI_BG_DeaHIDAutoInit2_Display(uint8_t Mode); /**/
void GUI_BG_DeaMeterExit_Display(uint8_t Mode); /*经销商模式是否结束经销商模式*/ void GUI_BG_DeaMeterExit_Display(uint8_t Mode); /*经销商模式是否结束经销商模式*/
void GUI_Display_DTC_Server(void); /**/ void GUI_Display_DTC_Server(void); /**/
...@@ -470,10 +473,10 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode); /*SCR故障*/ ...@@ -470,10 +473,10 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode); /*SCR故障*/
void GUI_BG_DTCAMT_Display(uint8_t Mode); /*AMT故障*/ void GUI_BG_DTCAMT_Display(uint8_t Mode); /*AMT故障*/
void GUI_Display_NULL(uint8_t Mode); /*无故障码*/ void GUI_Display_NULL(uint8_t Mode); /*无故障码*/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
void GUI_Test_Display(uint8_t Mode); void GUI_Test_Display(uint8_t Mode); /**/
void Common_EOL_User_Server(void); void Common_EOL_User_Server(void); /**/
void K_LINE_EOL_Val_Server(void); void K_LINE_EOL_Val_Server(void); /**/
/*-----报警--------------------------------------------------------*/ /*-----报警--------------------------------------------------------*/
void GUI_General_Popup(void); void GUI_General_Popup(void);
......
...@@ -563,6 +563,7 @@ void Level2_1Menu_1Do(void) ...@@ -563,6 +563,7 @@ void Level2_1Menu_1Do(void)
if (DTCNumDis == 1u) /*故障码轮显*/ if (DTCNumDis == 1u) /*故障码轮显*/
{ {
GUI_Display_DTC_Server(); GUI_Display_DTC_Server();
//GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL);
} }
else /*故障码读取中*/ else /*故障码读取中*/
{ {
......
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