Skip to content

V
VC66_7C
Commit 328eadc3 authored by hu's avatar hu
Browse files
Options

调整故障码显示逻辑

parent 0c17d9cd
Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 41 deletions
source/Application/Graphic/GUI/GUI.c
View file @ 328eadc3
...@@ -6641,6 +6641,7 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode) ...@@ -6641,6 +6641,7 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode)
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
uint8_t HYQ_TEST = 1;
void GUI_Display_DTC_Server(void) void GUI_Display_DTC_Server(void)
{ {
uint8_t i = 0u; uint8_t i = 0u;
...@@ -6650,12 +6651,12 @@ void GUI_Display_DTC_Server(void) ...@@ -6650,12 +6651,12 @@ void GUI_Display_DTC_Server(void)
Display_DTC[0u].Disp_True_False = 1u; Display_DTC[0u].Disp_True_False = 1u;
/*SRC故障*/ /*SRC故障*/
Display_DTC[1u].Disp_True_False = 1u; Display_DTC[1u].Disp_True_False = HYQ_TEST;
/*AMT故障*/ /*AMT故障*/
if ((K_Line_Set.K_Line_LID41 == 0x10u) || (K_Line_Set.K_Line_LID41 == 0x11u) || (K_Line_Set.K_Line_LID41 == 0x12u)) if ((K_Line_Set.K_Line_LID41 == 0x10u) || (K_Line_Set.K_Line_LID41 == 0x11u) || (K_Line_Set.K_Line_LID41 == 0x12u))
{ {
Display_DTC[2u].Disp_True_False = 1u; Display_DTC[2u].Disp_True_False = 0u;
} }
else else
{ {
...@@ -6675,26 +6676,43 @@ void GUI_Display_DTC_Server(void) ...@@ -6675,26 +6676,43 @@ void GUI_Display_DTC_Server(void)
{ {
DTCNumTime = 0u; DTCNumTime = 0u;
if (GUIDTCNumDis < (DTCNumeber - 1u)) GUIDTCNumDis++;
for ( ; (DTCNumeber - 1u) ; )
{
if (Display_DTC[GUIDTCNumDis].Disp_True_False == 0u)
{
GUIDTCNumDis++;
}
else
{
break;
}
}
}
}
else
{
for ( ; (DTCNumeber - 1u) ; )
{
if (Display_DTC[GUIDTCNumDis].Disp_True_False == 0u)
{ {
GUIDTCNumDis++; GUIDTCNumDis++;
} }
else else
{ {
GUIDTCNumDis = 0u; break;
} }
} }
} }
if (GUIDTCNumDis < (DTCNumeber - 1u))
{
;/*Do Nothing !*/
}
else else
{ {
if (GUIDTCNumDis < (DTCNumeber - 1u)) GUIDTCNumDis = 0u;
{
GUIDTCNumDis++;
}
else
{
GUIDTCNumDis = 0u;
}
} }
for (i = 0u; i < (DTCNumeber - 1u); i++) for (i = 0u; i < (DTCNumeber - 1u); i++)
...@@ -6707,14 +6725,7 @@ void GUI_Display_DTC_Server(void) ...@@ -6707,14 +6725,7 @@ void GUI_Display_DTC_Server(void)
GUIDTCNumDis = DTCNumeber; GUIDTCNumDis = DTCNumeber;
} }
if (Display_DTC[GUIDTCNumDis].Disp_True_False == 1u) Display_DTC[GUIDTCNumDis].Disp_Mod_Menu_Cbk(GUI_DISP_MODE_NORMAL);
{
Display_DTC[GUIDTCNumDis].Disp_Mod_Menu_Cbk(GUI_DISP_MODE_NORMAL);
}
else
{
;/*Do Nothing!*/
}
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
...@@ -6725,8 +6736,12 @@ void GUI_Display_DTC_Server(void) ...@@ -6725,8 +6736,12 @@ void GUI_Display_DTC_Server(void)
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
uint8_t DTCNum = 0u;
void GUI_BG_DTCEngine_Display(uint8_t Mode) void GUI_BG_DTCEngine_Display(uint8_t Mode)
{ {
//uint8_t DTCNum = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
...@@ -6735,11 +6750,203 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode) ...@@ -6735,11 +6750,203 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER); switch (DTCNum)
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 379u, 267u, GUI_BLENDMODE_SRC_OVER); {
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 408u, 267u, GUI_BLENDMODE_SRC_OVER); case 0x00u :
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 467u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x01u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_1, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x02u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_2, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x03u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_3, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x04u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_C, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x05u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_C, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_1, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x06u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_C, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_2, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x07u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_C, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_3, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x08u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_B, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x09u :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_B, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_1, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x0Au :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_B, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_2, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x0Bu :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_B, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_3, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x0Cu :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_U, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x0Du :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_U, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_1, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x0Eu :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_U, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_2, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
case 0x0Fu :
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_U, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_3, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIDTCNUM[0], 558u, 267u, GUI_BLENDMODE_SRC_OVER);
break;
default:
break;
}
} }
else else
{ {
...@@ -6766,10 +6973,13 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode) ...@@ -6766,10 +6973,13 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 379u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 408u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 467u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 558u, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -6796,10 +7006,13 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode) ...@@ -6796,10 +7006,13 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 379u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 408u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 408u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 467u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 468u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 558u, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
......
source/Application/Graphic/GUI/GUI.h
View file @ 328eadc3
...@@ -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);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 328eadc3
...@@ -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