Skip to content

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

增加故障码轮显

parent 1c68fad6
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 74 deletions
source/Application/APP/Key/Key_user.c
View file @ f67ea109
...@@ -336,6 +336,14 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -336,6 +336,14 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
User_set_Num.User_Parking = 0u; User_set_Num.User_Parking = 0u;
} }
} }
/*工厂模式*/ /*经销商模式*/
else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1_3MENU_2)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -692,6 +700,14 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -692,6 +700,14 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
User_set_Num.User_Parking = 0xFFu; User_set_Num.User_Parking = 0xFFu;
} }
} }
/*工厂模式*/ /*经销商模式*/
else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DIS_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL1_3MENU_2)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -799,7 +815,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -799,7 +815,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (User_set_Num.User_TpmsStatus == 1) if (User_set_Num.User_TpmsStatus == 1)
{ {
User_set_Num.User_TpmsStatus = 2; /*匹配轮胎*/ User_set_Num.User_TpmsStatus = 2; /*匹配轮胎*/
User_set_Num.User_TpmsSend = 3; /*报文外发状态*/ User_set_Num.User_TpmsSend = 3; /*报文外发状态*/
User_set_Num.User_Temp_Return = 0; /*清空取消标记位*/ User_set_Num.User_Temp_Return = 0; /*清空取消标记位*/
} }
} }
...@@ -809,6 +825,11 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent) ...@@ -809,6 +825,11 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
MenuFlag.Menu_Return = 1; MenuFlag.Menu_Return = 1;
NextMenu(_MN_DSP_RETURN_MENU); NextMenu(_MN_DSP_RETURN_MENU);
} }
/*工厂模式 经销商模式*/
else if ((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DIS_DSP_LEVEL2_1MENU_4))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{ {
...@@ -908,7 +929,7 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -908,7 +929,7 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
if (User_set_Num.User_Temp_Return == 0u) if (User_set_Num.User_Temp_Return == 0u)
{ {
User_set_Num.User_Temp_Return = 1u; /*取消配对标记*/ User_set_Num.User_Temp_Return = 1u; /*取消配对标记*/
User_set_Num.User_TpmsSend = 3u; /*报文外发状态*/ User_set_Num.User_TpmsSend = 3u; /*报文外发状态*/
} }
else else
{ {
...@@ -1088,7 +1109,7 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -1088,7 +1109,7 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
Input: Input:
Output: Output:
*******************************ODOTrip***********************************************/ *******************************ODOTrip***********************************************/
void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent) void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
{ {
uint16_t DispVSpeed = 0u; uint16_t DispVSpeed = 0u;
UElib_uint16_t HMI_MENU_Sta = 0u; UElib_uint16_t HMI_MENU_Sta = 0u;
...@@ -1113,15 +1134,14 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent) ...@@ -1113,15 +1134,14 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent)
} }
else if (bCurMenuIDX == _MN_DSP_Menu_Test) else if (bCurMenuIDX == _MN_DSP_Menu_Test)
{ {
} }
else if (User_set_Num.Trip_Type == 0u) else if (User_set_Num.Trip_Type == 0u)
{ {
User_set_Num.Trip_Type = 1u; User_set_Num.Trip_Type = 1u;
} }
else else
{ {
User_set_Num.Trip_Type = 0u; User_set_Num.Trip_Type = 0u;
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS) else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
...@@ -1137,7 +1157,7 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent) ...@@ -1137,7 +1157,7 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent)
if (State_Flag.FState_ClearOilTx == 0u) if (State_Flag.FState_ClearOilTx == 0u)
{ {
State_Flag.FState_ClearOilTx = 1u; State_Flag.FState_ClearOilTx = 1u;
} }
} }
#if 0 #if 0
...@@ -1386,11 +1406,11 @@ Key_Real_Status_en_t Key_Real_Status_Read_ODOTrip(void) ...@@ -1386,11 +1406,11 @@ Key_Real_Status_en_t Key_Real_Status_Read_ODOTrip(void)
/*---------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------*/
const Key_Attribute_st_t stKeyAttribute[KEY_NUM_MAX] = const Key_Attribute_st_t stKeyAttribute[KEY_NUM_MAX] =
{ {
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Up , Key_Operation_Up }, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Up, Key_Operation_Up},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down , Key_Operation_Down }, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Down, Key_Operation_Down},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Enter , Key_Operation_Enter }, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Enter, Key_Operation_Enter},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return , Key_Operation_Return }, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Return, Key_Operation_Return},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Menu , Key_Operation_Menu }, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_Menu, Key_Operation_Menu},
{KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_ODOTrip, Key_Operation_ODOTrip}, {KEY_NEED_DEBOUNCE_NORMAL, Key_Real_Status_Read_ODOTrip, Key_Operation_ODOTrip},
}; };
......
source/Application/Graphic/GUI/GUI.c
View file @ f67ea109
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
#include "Popup_Scheduler.h" #include "Popup_Scheduler.h"
#include "Popups.h" #include "Popups.h"
uint32_t HYQ_TEST = 3;
volatile _Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/ volatile _Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/
_TPMS TPMS_Matching; _TPMS TPMS_Matching;
_UserSet User_set_Num; _UserSet User_set_Num;
_UserSet User_App; _UserSet User_App;
Display_Modular_St Display_DTC[4u];
#pragma alignvar(8) #pragma alignvar(8)
uint8_t EolNUM[10u][8u]; uint8_t EolNUM[10u][8u];
...@@ -218,6 +218,12 @@ void GUI_Display_Value_Init(void) ...@@ -218,6 +218,12 @@ void GUI_Display_Value_Init(void)
User_set_Num.User_Parking = User_App.User_Parking ; User_set_Num.User_Parking = User_App.User_Parking ;
MenuFlag.Menu_Flag = 0; /*菜单初始化位置*/ MenuFlag.Menu_Flag = 0; /*菜单初始化位置*/
Display_DTC[0u].Disp_Mod_Menu_Cbk = GUI_BG_DTCEngine_Display; /*发动机故障*/
Display_DTC[1u].Disp_Mod_Menu_Cbk = GUI_BG_DTCSCR_Display; /*SRC故障*/
Display_DTC[2u].Disp_Mod_Menu_Cbk = GUI_BG_DTCAMT_Display; /*AMT故障*/
Display_DTC[3u].Disp_Mod_Menu_Cbk = GUI_Display_NULL; /*无故障*/
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group * Function Name : GUI_Display_OftenShow_Group
...@@ -2083,14 +2089,15 @@ void GUI_BG_Menu_Display(uint8_t Mode) ...@@ -2083,14 +2089,15 @@ void GUI_BG_Menu_Display(uint8_t Mode)
{ {
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_1) if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_1)
{ {
if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/ //if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/
{ //{
GUI_General_Display(MENU_Sprite, CN_User_Menu1_01white, GUI_BLENDMODE_SRC_OVER); // GUI_General_Display(MENU_Sprite, CN_User_Menu1_01white, GUI_BLENDMODE_SRC_OVER);
} //}
else //else
{ //{
GUI_General_Display(MENU_Sprite, CN_User_Menu1_01grey, GUI_BLENDMODE_SRC_OVER); // GUI_General_Display(MENU_Sprite, CN_User_Menu1_01grey, GUI_BLENDMODE_SRC_OVER);
} //}
GUI_General_Display(MENU_Sprite, CN_User_Menu1_01white, GUI_BLENDMODE_SRC_OVER);
} }
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_2) if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_2)
{ {
...@@ -6541,6 +6548,78 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode) ...@@ -6541,6 +6548,78 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_Display_DTC_Server
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
uint8_t DTCNumTime = 0u;
static uint8_t DTCNumDis = 0u;
void GUI_Display_DTC_Server(void)
{
uint8_t i = 0u;
//uint8_t DTCNumTime = 0u;
//uint8_t DTCNumDis = 0u;
uint8_t DTCNum = 0u;
Display_DTC[0u].Disp_True_False = 1u;
Display_DTC[1u].Disp_True_False = 0u;
Display_DTC[2u].Disp_True_False = 1u;
Display_DTC[3u].Disp_True_False = 1u;
if (Display_DTC[DTCNumDis].Disp_True_False == 1u)
{
if (DTCNumTime <= 50u)
{
DTCNumTime ++;
}
else
{
DTCNumTime = 0u;
if (DTCNumDis < 2u)
{
DTCNumDis++;
}
else
{
DTCNumDis = 0u;
}
}
}
else
{
if (DTCNumDis < 2u)
{
DTCNumDis++;
}
else
{
DTCNumDis = 0u;
}
}
DTCNum = Display_DTC[0u].Disp_True_False +
Display_DTC[1u].Disp_True_False +
Display_DTC[2u].Disp_True_False ;
if (DTCNum == 0u)
{
DTCNumDis = 3u;
}
if (Display_DTC[DTCNumDis].Disp_True_False == 1u)
{
Display_DTC[DTCNumDis].Disp_Mod_Menu_Cbk(GUI_DISP_MODE_NORMAL);
}
else
{
;/*Do Nothing!*/
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu6_Display * Function Name : GUI_BG_FacMenu6_Display
* Description : * Description :
...@@ -6630,6 +6709,17 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode) ...@@ -6630,6 +6709,17 @@ void GUI_BG_DTCAMT_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_Display_NULL(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClear_Display * Function Name : GUI_BG_FacDTCClear_Display
......
source/Application/Graphic/GUI/GUI.h
View file @ f67ea109
...@@ -294,6 +294,14 @@ static const uint16_t GUIBGAVGFuelPosX[4] = {667u, 628u, 603u, 578u}; ...@@ -294,6 +294,14 @@ 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};
typedef void ( * Disp_Mod_Menu ) (uint8_t Mode);
typedef struct
{
uint8_t Disp_True_False;
uint8_t Disp_Site;
Disp_Mod_Menu Disp_Mod_Menu_Cbk;
} Display_Modular_St;
extern void GUI_Display_KL15_ON_Init(void); extern void GUI_Display_KL15_ON_Init(void);
extern void GUI_Display_KL15_OFF_Init(void); extern void GUI_Display_KL15_OFF_Init(void);
extern void GUI_Display_Value_Init(void); /*显示数据初始化*/ extern void GUI_Display_Value_Init(void); /*显示数据初始化*/
...@@ -431,9 +439,11 @@ void GUI_BG_DisDTCClear_Display(uint8_t Mode); /*经销商模式清除D ...@@ -431,9 +439,11 @@ void GUI_BG_DisDTCClear_Display(uint8_t Mode); /*经销商模式清除D
void GUI_BG_DisDTCClearYN_Display(uint8_t Mode); /*经销商模式清除DTC2*/ void GUI_BG_DisDTCClearYN_Display(uint8_t Mode); /*经销商模式清除DTC2*/
void GUI_BG_DisMeter_Display(uint8_t Mode); /*经销商模式仪表显示*/ void GUI_BG_DisMeter_Display(uint8_t Mode); /*经销商模式仪表显示*/
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_DTCSCR_Display(uint8_t Mode); /*SCR故障*/ 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_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);
......
source/Application/Graphic/Menu/Menu.h
View file @ f67ea109
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#define EXTERN_MEU_PROCESS extern #define EXTERN_MEU_PROCESS extern
#endif #endif
#define K_Line_User_RYLQQ 44 #define K_Line_User_RYLQQ 44
#define K_Line_User_KQGZJ 100 #define K_Line_User_KQGZJ 100
#define _MN_IDX_NULL 0xff #define _MN_IDX_NULL 0xff
#define _MN_IDX_NULL0 0x00 #define _MN_IDX_NULL0 0x00
...@@ -118,8 +118,8 @@ typedef enum ...@@ -118,8 +118,8 @@ typedef enum
_MN_DSP_LEVEL3_5_MENU_3, /* 78 AEBS第2警报演示*/ _MN_DSP_LEVEL3_5_MENU_3, /* 78 AEBS第2警报演示*/
_MN_DSP_LEVEL3_5_MENU_4, /* 79 AEBS全力制动警报演示*/ _MN_DSP_LEVEL3_5_MENU_4, /* 79 AEBS全力制动警报演示*/
_MN_DSP_Menu_OFF, /* 80 */ _MN_DSP_Menu_OFF, /* 80 */
_MN_DSP_Menu_Test, /* 81 */ _MN_DSP_Menu_Test, /* 81 */
/*工厂模式*/ /*工厂模式*/
_FAC_DSP_LEVEL1MENU_1, /* 82 DTC显示*/ _FAC_DSP_LEVEL1MENU_1, /* 82 DTC显示*/
...@@ -143,32 +143,25 @@ typedef enum ...@@ -143,32 +143,25 @@ typedef enum
_FAC_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/ _FAC_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/
/*经销商模式*/ /*经销商模式*/
_DIS_DSP_LEVEL1MENU_1, /* 82 DTC显示*/ _DIS_DSP_LEVEL1MENU_1, /* 97 DTC显示*/
_DIS_DSP_LEVEL1MENU_2, /* 83 DTC清除*/ _DIS_DSP_LEVEL1MENU_2, /* 98 DTC清除*/
_DIS_DSP_LEVEL1MENU_3, /* 84 仪表设定显示*/ _DIS_DSP_LEVEL1MENU_3, /* 99 仪表设定显示*/
_DIS_DSP_LEVEL1MENU_4, /* 85 暂时通常模式*/ _DIS_DSP_LEVEL1MENU_4, /* 100 暂时通常模式*/
_DIS_DSP_LEVEL1MENU_5, /* 86 结束经销商模式*/ _DIS_DSP_LEVEL1MENU_5, /* 101 结束经销商模式*/
_DIS_DSP_LEVEL1MENU_6, /* 87 HID自动水平初始化*/ _DIS_DSP_LEVEL1MENU_6, /* 102 HID自动水平初始化*/
_DIS_DSP_LEVEL1_1MENU_1, /* 88 故障码读取中*/
_DIS_DSP_LEVEL1_2MENU_1, /* 89 清除所有DTC*/
_DIS_DSP_LEVEL1_2MENU_2, /* 90 清除所有DTC*/
_DIS_DSP_LEVEL1_3MENU_1, /* 91 L0-7 H2-A*/
_DIS_DSP_LEVEL1_3MENU_2, /* 92 L8-F H2-A*/
_DIS_DSP_LEVEL2_1MENU_1, /* 93 发动机故障*/
_DIS_DSP_LEVEL2_1MENU_2, /* 94 SCR系统故障*/
_DIS_DSP_LEVEL2_1MENU_3, /* 95 EBS/ABS故障*/
_DIS_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/
_DIS_DSP_LEVEL1_1MENU_1, /* 103 故障码读取中*/
_DIS_DSP_LEVEL1_2MENU_1, /* 104 清除所有DTC*/
_DIS_DSP_LEVEL1_2MENU_2, /* 105 清除所有DTC*/
_DIS_DSP_LEVEL1_3MENU_1, /* 106 L0-7 H2-A*/
_DIS_DSP_LEVEL1_3MENU_2, /* 107 L8-F H2-A*/
_DIS_DSP_LEVEL2_1MENU_1, /* 108 发动机故障*/
_DIS_DSP_LEVEL2_1MENU_2, /* 109 SCR系统故障*/
_DIS_DSP_LEVEL2_1MENU_3, /* 110 EBS/ABS故障*/
_DIS_DSP_LEVEL2_1MENU_4, /* 111 仪表故障*/
_MN_DSP_MENU_MAX, _MN_DSP_MENU_MAX,
...@@ -189,17 +182,17 @@ typedef struct ...@@ -189,17 +182,17 @@ typedef struct
typedef struct typedef struct
{ {
uint8_t Menu_Flag; /*主界面标记*/ uint8_t Menu_Flag; /*主界面标记*/
uint8_t Menu_Time_Flag; /*从Enter界面确认退出计时*/ uint8_t Menu_Time_Flag; /*从Enter界面确认退出计时*/
uint8_t Menu_Enter_Return; /*进入Enter之前界面*/ uint8_t Menu_Enter_Return; /*进入Enter之前界面*/
uint8_t Menu_Return; /*Enter Return界面切换标记*/ uint8_t Menu_Return; /*Enter Return界面切换标记*/
uint16_t Key_Menu_Popup_time; /*报警状态持续时间*/ uint16_t Key_Menu_Popup_time; /*报警状态持续时间*/
uint8_t Menu_Key_Time; /*按键长按时间记录*/ uint8_t Menu_Key_Time; /*按键长按时间记录*/
uint8_t Key_Menu_Popup_Flag; /*报警界面menu按键长按 */ uint8_t Key_Menu_Popup_Flag; /*报警界面menu按键长按 */
uint8_t Menu_Popup_Flag; /*界面状态 0-通常 1-报警 2-工厂 3-经销商 4-仪表自我诊断*/ uint8_t Menu_Popup_Flag; /*界面状态 0-通常 1-报警 2-工厂 3-经销商 4-仪表自我诊断*/
uint8_t MenuNum; /*历史界面保存*/ uint8_t MenuNum; /*历史界面保存*/
uint8_t Key_MenuTest_Long; /**/ uint8_t Key_MenuTest_Long; /**/
uint8_t Key_MenuTest_ShortNum; /**/ uint8_t Key_MenuTest_ShortNum; /**/
uint8_t Menu_Factory; uint8_t Menu_Factory;
uint8_t Menu_Dealer; uint8_t Menu_Dealer;
uint8_t Menu_Test; uint8_t Menu_Test;
...@@ -421,9 +414,9 @@ EXTERN_MEU_PROCESS void Level3_3Menu_4Enter(void); ...@@ -421,9 +414,9 @@ EXTERN_MEU_PROCESS void Level3_3Menu_4Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_4Do(void); EXTERN_MEU_PROCESS void Level3_3Menu_4Do(void);
EXTERN_MEU_PROCESS void Level3_3Menu_4Exit(void); EXTERN_MEU_PROCESS void Level3_3Menu_4Exit(void);
//EXTERN_MEU_PROCESS void Level3_3Menu_5Enter(void); // EXTERN_MEU_PROCESS void Level3_3Menu_5Enter(void);
//EXTERN_MEU_PROCESS void Level3_3Menu_5Do(void); // EXTERN_MEU_PROCESS void Level3_3Menu_5Do(void);
//EXTERN_MEU_PROCESS void Level3_3Menu_5Exit(void); // EXTERN_MEU_PROCESS void Level3_3Menu_5Exit(void);
EXTERN_MEU_PROCESS void Level3_3Menu_6Enter(void); EXTERN_MEU_PROCESS void Level3_3Menu_6Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_6Do(void); EXTERN_MEU_PROCESS void Level3_3Menu_6Do(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ f67ea109
...@@ -133,11 +133,11 @@ const _MenuOptTab MenuOptTab[] = ...@@ -133,11 +133,11 @@ const _MenuOptTab MenuOptTab[] =
/*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*88*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit}, /*89*/{ _FAC_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*90*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit}, /*90*/{ _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*91*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit}, /*91*/{ _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_2, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*92*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit}, /*92*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*93*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*93*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit}, /*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
...@@ -145,12 +145,25 @@ const _MenuOptTab MenuOptTab[] = ...@@ -145,12 +145,25 @@ const _MenuOptTab MenuOptTab[] =
/*96*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit}, /*96*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*经销商模式*/ /*经销商模式*/
/*82*/{ _DIS_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelD1Menu_1Enter, LevelD1Menu_1Do, LevelD1Menu_1Exit}, /*97*/{ _DIS_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelD1Menu_1Enter, LevelD1Menu_1Do, LevelD1Menu_1Exit},
/*83*/{ _DIS_DSP_LEVEL1MENU_2, _DIS_DSP_LEVEL1MENU_1, _DIS_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelD1Menu_2Enter, LevelD1Menu_2Do, LevelD1Menu_2Exit}, /*98*/{ _DIS_DSP_LEVEL1MENU_2, _DIS_DSP_LEVEL1MENU_1, _DIS_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelD1Menu_2Enter, LevelD1Menu_2Do, LevelD1Menu_2Exit},
/*84*/{ _DIS_DSP_LEVEL1_3MENU_1, _DIS_DSP_LEVEL1MENU_2, _DIS_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelD1Menu_3Enter, LevelD1Menu_3Do, LevelD1Menu_3Exit}, /*99*/{ _DIS_DSP_LEVEL1_3MENU_1, _DIS_DSP_LEVEL1MENU_2, _DIS_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelD1Menu_3Enter, LevelD1Menu_3Do, LevelD1Menu_3Exit},
/*85*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_3, _DIS_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelD1Menu_4Enter, LevelD1Menu_4Do, LevelD1Menu_4Exit}, /*00*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_3, _DIS_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelD1Menu_4Enter, LevelD1Menu_4Do, LevelD1Menu_4Exit},
/*86*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_4, _DIS_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelD1Menu_5Enter, LevelD1Menu_5Do, LevelD1Menu_5Exit}, /*01*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_4, _DIS_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelD1Menu_5Enter, LevelD1Menu_5Do, LevelD1Menu_5Exit},
/*87*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit}, /*02*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit},
/*03*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*04*/{ _DIS_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*05*/{ _DIS_DSP_LEVEL1MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*06*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1_3MENU_2, _DIS_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*07*/{ _MN_IDX_NULL, _DIS_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*08*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*09*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*10*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*11*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DIS_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
}; };
void NextMenu(_MENU_IDX idx) void NextMenu(_MENU_IDX idx)
...@@ -385,11 +398,23 @@ void Level2Menu_6Exit(void) ...@@ -385,11 +398,23 @@ void Level2Menu_6Exit(void)
/*发动机故障*/ /*发动机故障*/
void Level2_1Menu_1Enter(void) void Level2_1Menu_1Enter(void)
{} {}
static uint8_t DTCNumDis = 0u;
void Level2_1Menu_1Do(void) void Level2_1Menu_1Do(void)
{ {
//uint8_t DTCNumDis = 0u;
//DTCNumDis = 0u;
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_DTCReading_Display(GUI_DISP_MODE_NORMAL);
if (DTCNumDis == 1u) /*故障码轮显*/
{
GUI_Display_DTC_Server();
}
else /*故障码读取中*/
{
GUI_BG_DTCReading_Display(GUI_DISP_MODE_NORMAL);
}
} }
void Level2_1Menu_1Exit(void) void Level2_1Menu_1Exit(void)
{} {}
...@@ -1784,7 +1809,6 @@ void LevelF1_3Menu_2Do(void) ...@@ -1784,7 +1809,6 @@ void LevelF1_3Menu_2Do(void)
void LevelF1_3Menu_2Exit(void) void LevelF1_3Menu_2Exit(void)
{} {}
/*经销商模式*/
/*----经销商模式----DTC显示----*/ /*----经销商模式----DTC显示----*/
void LevelD1Menu_1Enter(void) void LevelD1Menu_1Enter(void)
{} {}
......
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