Skip to content

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

增加DTC界面显示

parent d06fea00
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 26 deletions
source/Application/Alarm/Popups.c
View file @ e1502a5e
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void Popups_Management_Service(void) void Popups_Management_Service(void)
{ {
Popups_Polling(); //Popups_Polling();
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
......
source/Application/Graphic/GUI/GUI.c
View file @ e1502a5e
...@@ -6819,30 +6819,72 @@ void GUI_Display_DTC_Server(void) ...@@ -6819,30 +6819,72 @@ void GUI_Display_DTC_Server(void)
uint8_t DTCNum = 0u; uint8_t DTCNum = 0u;
/*发动机故障*/ /*发动机故障*/
//if (DisDTCNum != 0x00u)
//{
// Display_DTC[0u].Disp_True_False = 1u;
//}
//else
//{
// Display_DTC[0u].Disp_True_False = 0u;
//}
/*刹车故障*/
if (DisDTCNum != 0x00u) if (DisDTCNum != 0x00u)
{ {
Display_DTC[0u].Disp_True_False = 1u; Display_DTC[1u].Disp_True_False = 1u;
} }
else else
{ {
Display_DTC[0u].Disp_True_False = 0u; Display_DTC[1u].Disp_True_False = 0u;
} }
/*变速箱故障*/
/*SRC故障*/ //if (DisDTCNum != 0x00u)
Display_DTC[1u].Disp_True_False = 0u; //{
// Display_DTC[2u].Disp_True_False = 1u;
/*AMT故障*/ //}
if ((K_Line_Set.K_Line_LID41 == 0x10u) || (K_Line_Set.K_Line_LID41 == 0x11u) || (K_Line_Set.K_Line_LID41 == 0x12u)) //else
{ //{
Display_DTC[2u].Disp_True_False = 0u; // Display_DTC[2u].Disp_True_False = 0u;
} //}
else ///*雷达故障码*/
{ //if (DisDTCNum != 0x00u)
Display_DTC[2u].Disp_True_False = 0u; //{
} // Display_DTC[3u].Disp_True_False = 1u;
//}
//else
//{
// Display_DTC[3u].Disp_True_False = 0u;
//}
///*摄像头故障码*/
//if (DisDTCNum != 0x00u)
//{
// Display_DTC[4u].Disp_True_False = 1u;
//}
//else
//{
// Display_DTC[4u].Disp_True_False = 0u;
//}
///*液力缓速器故障码*/
//if (DisDTCNum != 0x00u)
//{
// Display_DTC[5u].Disp_True_False = 1u;
//}
//else
//{
// Display_DTC[5u].Disp_True_False = 0u;
//}
/*SCR故障*/
//if (DisDTCNum != 0x00u)
//{
// Display_DTC[0u].Disp_True_False = 1u;
//}
//else
//{
// Display_DTC[0u].Disp_True_False = 0u;
//}
/*无故障*/ /*无故障*/
Display_DTC[3u].Disp_True_False = 1u; Display_DTC[DTCNumeber].Disp_True_False = 1u;
if (Display_DTC[GUIDTCNumDis].Disp_True_False == 1u) if (Display_DTC[GUIDTCNumDis].Disp_True_False == 1u)
{ {
...@@ -7057,7 +7099,29 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode) ...@@ -7057,7 +7099,29 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
} }
void GUI_BG_MenuDTCEngine_Display(uint8_t Mode)
{
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_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
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_D, 311u, 267u, GUI_BLENDMODE_SRC_OVER);/*D*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_T, 341u, 267u, GUI_BLENDMODE_SRC_OVER);/*T*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_C, 376u, 267u, GUI_BLENDMODE_SRC_OVER);/*C*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 406u, 262u, GUI_BLENDMODE_SRC_OVER);/*-*/
GUI_General_Digit_Display(MENU_Sprite, 8888, CN_Nb_28_0, 4u, 0u, GUIBGDTCPosX, 267u, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_DTCBrake_Display(uint8_t Mode) void GUI_BG_DTCBrake_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
...@@ -7065,8 +7129,16 @@ void GUI_BG_DTCBrake_Display(uint8_t Mode) ...@@ -7065,8 +7129,16 @@ void GUI_BG_DTCBrake_Display(uint8_t Mode)
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*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/ GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_07_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_07_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_D, 311u, 267u, GUI_BLENDMODE_SRC_OVER);/*D*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_T, 341u, 267u, GUI_BLENDMODE_SRC_OVER);/*T*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_C, 376u, 267u, GUI_BLENDMODE_SRC_OVER);/*C*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 406u, 262u, GUI_BLENDMODE_SRC_OVER);/*-*/
GUI_General_Digit_Display(MENU_Sprite, 8888, CN_Nb_28_0, 4u, 0u, GUIBGDTCPosX, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -7083,6 +7155,14 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode) ...@@ -7083,6 +7155,14 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
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_Translate_Display(MENU_Sprite, CN_Alarm_Fault_D, 311u, 267u, GUI_BLENDMODE_SRC_OVER);/*D*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_T, 341u, 267u, GUI_BLENDMODE_SRC_OVER);/*T*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_C, 376u, 267u, GUI_BLENDMODE_SRC_OVER);/*C*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 406u, 262u, GUI_BLENDMODE_SRC_OVER);/*-*/
GUI_General_Digit_Display(MENU_Sprite, 8888, CN_Nb_28_0, 4u, 0u, GUIBGDTCPosX, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -7099,6 +7179,14 @@ void GUI_BG_DTCRadar_Display(uint8_t Mode) ...@@ -7099,6 +7179,14 @@ void GUI_BG_DTCRadar_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
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_Translate_Display(MENU_Sprite, CN_Alarm_Fault_D, 311u, 267u, GUI_BLENDMODE_SRC_OVER);/*D*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_T, 341u, 267u, GUI_BLENDMODE_SRC_OVER);/*T*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_C, 376u, 267u, GUI_BLENDMODE_SRC_OVER);/*C*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 406u, 262u, GUI_BLENDMODE_SRC_OVER);/*-*/
GUI_General_Digit_Display(MENU_Sprite, 8888, CN_Nb_28_0, 4u, 0u, GUIBGDTCPosX, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -7116,6 +7204,13 @@ void GUI_BG_DTCCamera_Display(uint8_t Mode) ...@@ -7116,6 +7204,13 @@ void GUI_BG_DTCCamera_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
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_Translate_Display(MENU_Sprite, CN_Alarm_Fault_D, 311u, 267u, GUI_BLENDMODE_SRC_OVER);/*D*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_T, 341u, 267u, GUI_BLENDMODE_SRC_OVER);/*T*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_C, 376u, 267u, GUI_BLENDMODE_SRC_OVER);/*C*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 406u, 262u, GUI_BLENDMODE_SRC_OVER);/*-*/
GUI_General_Digit_Display(MENU_Sprite, 8888, CN_Nb_28_0, 4u, 0u, GUIBGDTCPosX, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -7132,6 +7227,14 @@ void GUI_BG_DTCIntarder_Display(uint8_t Mode) ...@@ -7132,6 +7227,14 @@ void GUI_BG_DTCIntarder_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
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_Translate_Display(MENU_Sprite, CN_Alarm_Fault_D, 311u, 267u, GUI_BLENDMODE_SRC_OVER);/*D*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_T, 341u, 267u, GUI_BLENDMODE_SRC_OVER);/*T*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_C, 376u, 267u, GUI_BLENDMODE_SRC_OVER);/*C*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 406u, 262u, GUI_BLENDMODE_SRC_OVER);/*-*/
GUI_General_Digit_Display(MENU_Sprite, 8888, CN_Nb_28_0, 4u, 0u, GUIBGDTCPosX, 267u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
......
source/Application/Graphic/GUI/GUI.h
View file @ e1502a5e
...@@ -314,7 +314,7 @@ static const uint16_t GUIBGAVGSpeedPosX[4] = {667u, 642u, 617u, 592u}; ...@@ -314,7 +314,7 @@ static const uint16_t GUIBGAVGSpeedPosX[4] = {667u, 642u, 617u, 592u};
static const uint16_t GUIBGAVGFuelPosX[4] = {667u, 628u, 603u, 578u}; static const uint16_t GUIBGAVGFuelPosX[4] = {667u, 628u, 603u, 578u};
static const uint16_t GUIBGTestPosX[6] = {569u, 540u, 497u, 468u, 424u, 395u}; static const uint16_t GUIBGTestPosX[6] = {569u, 540u, 497u, 468u, 424u, 395u};
static const uint16_t GUIBGDTCPosX[5] = {558u, 528u, 468u, 438u, 408u}; static const uint16_t GUIBGDTCPosX[4] = {521u, 491u, 461u, 431u};
typedef void ( * Disp_Mod_Menu ) (uint8_t Mode); typedef void ( * Disp_Mod_Menu ) (uint8_t Mode);
typedef struct typedef struct
...@@ -476,6 +476,7 @@ void GUI_BG_DeaMeterExit_Display(uint8_t Mode); /*经销商模式是否 ...@@ -476,6 +476,7 @@ void GUI_BG_DeaMeterExit_Display(uint8_t Mode); /*经销商模式是否
void GUI_Display_DTC_Server(void); /**/ void GUI_Display_DTC_Server(void); /**/
void GUI_BG_DTCEngine_Display(uint8_t Mode); /*发动机故障*/ void GUI_BG_DTCEngine_Display(uint8_t Mode); /*发动机故障*/
void GUI_BG_MenuDTCEngine_Display(uint8_t Mode); /*MENU发动机故障*/
void GUI_BG_DTCBrake_Display(uint8_t Mode); /*刹车故障*/ void GUI_BG_DTCBrake_Display(uint8_t Mode); /*刹车故障*/
void GUI_BG_DTCAMT_Display(uint8_t Mode); /*变速箱故障*/ void GUI_BG_DTCAMT_Display(uint8_t Mode); /*变速箱故障*/
void GUI_BG_DTCRadar_Display(uint8_t Mode); /*雷达故障码*/ void GUI_BG_DTCRadar_Display(uint8_t Mode); /*雷达故障码*/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ e1502a5e
...@@ -602,7 +602,8 @@ void Level2_1Menu_1Do(void) ...@@ -602,7 +602,8 @@ void Level2_1Menu_1Do(void)
if (DTCNumDis == 1u) /*计时*/ if (DTCNumDis == 1u) /*计时*/
{ {
GUI_Display_DTC_Server(); //GUI_Display_DTC_Server();
GUI_BG_DTCBrake_Display(GUI_DISP_MODE_NORMAL);
//GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL); //GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL);
} }
else /*故障码读取中*/ else /*故障码读取中*/
......
source/Driver/CAN/RSCAN_Table.c
View file @ e1502a5e
...@@ -37,7 +37,7 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] = ...@@ -37,7 +37,7 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] =
{0x98EF1718ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*20*/ {0x98EF1718ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*20*/
{0x98F00000ul, 0xDFF00000UL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*21*/ {0x98F00000ul, 0xDFF00000UL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*21*/
{0x9CFFFEF2ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*22*/ {0x9CFFFEF2ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*22*/
{0x98DA17FAul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*23*/ {0x98DA0000ul, 0xDFFF0000UL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*23*/
{0x98DBFFFAul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*24*/ {0x98DBFFFAul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH0_RX_SELECT},/*24*/
{0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/ {0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/
......
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