Skip to content

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

调整模式转换bug

parent 452dfb7d
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
source/Application/Graphic/GUI/GUI.h
View file @ 1c93b082
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#define FState_COilTimeOutNum 60u /*3S*/ #define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10000)) /*硬件版本号 HV:01.00.00*/ #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10200)) /*硬件版本号 HV:01.02.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)(10)) /*FLASH版本号 FV:00.10*/
typedef struct typedef struct
{ {
......
source/Application/Graphic/Menu/Menu.h
View file @ 1c93b082
...@@ -149,31 +149,31 @@ typedef enum ...@@ -149,31 +149,31 @@ typedef enum
_FAC_DSP_LEVEL2_5MENU_1, /*100 是否结束工厂模式*/ _FAC_DSP_LEVEL2_5MENU_1, /*100 是否结束工厂模式*/
/*经销商模式*/ /*经销商模式*/
_DEA_DSP_LEVEL0MENU_1, /*100*/ _DEA_DSP_LEVEL0MENU_1, /*101*/
_DEA_DSP_LEVEL1MENU_1, /* 101 DTC显示*/ _DEA_DSP_LEVEL1MENU_1, /* 102 DTC显示*/
_DEA_DSP_LEVEL1MENU_2, /* 102 DTC清除*/ _DEA_DSP_LEVEL1MENU_2, /* 103 DTC清除*/
_DEA_DSP_LEVEL1MENU_3, /* 103 仪表设定显示*/ _DEA_DSP_LEVEL1MENU_3, /* 104 仪表设定显示*/
_DEA_DSP_LEVEL1MENU_4, /* 104 暂时通常模式*/ _DEA_DSP_LEVEL1MENU_4, /* 105 暂时通常模式*/
_DEA_DSP_LEVEL1MENU_5, /* 105 结束经销商模式*/ _DEA_DSP_LEVEL1MENU_5, /* 106 结束经销商模式*/
_DEA_DSP_LEVEL1MENU_6, /* 106 HID自动水平初始化*/ _DEA_DSP_LEVEL1MENU_6, /* 107 HID自动水平初始化*/
_DEA_DSP_LEVEL1_1MENU_1, /* 107 故障码读取中*/ _DEA_DSP_LEVEL1_1MENU_1, /* 108 故障码读取中*/
_DEA_DSP_LEVEL1_2MENU_1, /* 108 清除所有DTC*/ _DEA_DSP_LEVEL1_2MENU_1, /* 109 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_2, /* 109 清除所有DTC*/ _DEA_DSP_LEVEL1_2MENU_2, /* 110 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_3, /* 110 清除所有DTC*/ _DEA_DSP_LEVEL1_2MENU_3, /* 111 清除所有DTC*/
_DEA_DSP_LEVEL1_2MENU_4, /* 111 清除所有DTC*/ _DEA_DSP_LEVEL1_2MENU_4, /* 112 清除所有DTC*/
_DEA_DSP_LEVEL1_3MENU_1, /* 112 L0-7 H2-A*/ _DEA_DSP_LEVEL1_3MENU_1, /* 113 L0-7 H2-A*/
_DEA_DSP_LEVEL1_3MENU_2, /* 113 L8-F H2-A*/ _DEA_DSP_LEVEL1_3MENU_2, /* 114 L8-F H2-A*/
_DEA_DSP_LEVEL2_1MENU_1, /* 114 发动机故障*/ _DEA_DSP_LEVEL2_1MENU_1, /* 115 发动机故障*/
_DEA_DSP_LEVEL2_1MENU_2, /* 115 SCR系统故障*/ _DEA_DSP_LEVEL2_1MENU_2, /* 116 SCR系统故障*/
_DEA_DSP_LEVEL2_1MENU_3, /* 116 EBS/ABS故障*/ _DEA_DSP_LEVEL2_1MENU_3, /* 117 EBS/ABS故障*/
_DEA_DSP_LEVEL2_1MENU_4, /* 117 仪表故障*/ _DEA_DSP_LEVEL2_1MENU_4, /* 118 仪表故障*/
_DEA_DSP_LEVEL2_5MENU_1, /*100 是否结束经销商模式*/ _DEA_DSP_LEVEL2_5MENU_1, /*119 是否结束经销商模式*/
_MN_DSP_MENU_MAX, _MN_DSP_MENU_MAX,
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 1c93b082
...@@ -148,34 +148,34 @@ const _MenuOptTab MenuOptTab[] = ...@@ -148,34 +148,34 @@ const _MenuOptTab MenuOptTab[] =
/*98*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit}, /*98*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*99*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit}, /*99*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*99*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, LevelF2_5Menu_1Enter, LevelF2_5Menu_1Do, LevelF2_5Menu_1Exit}, /*00*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, LevelF2_5Menu_1Enter, LevelF2_5Menu_1Do, LevelF2_5Menu_1Exit},
/*经销商模式*/ /*经销商模式*/
/*00*/{ _DEA_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD0Menu_1Enter, LevelD0Menu_1Do, LevelD0Menu_1Exit}, /*01*/{ _DEA_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD0Menu_1Enter, LevelD0Menu_1Do, LevelD0Menu_1Exit},
/*01*/{ _DEA_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelD1Menu_1Enter, LevelD1Menu_1Do, LevelD1Menu_1Exit}, /*02*/{ _DEA_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelD1Menu_1Enter, LevelD1Menu_1Do, LevelD1Menu_1Exit},
/*02*/{ _DEA_DSP_LEVEL1_2MENU_1, _DEA_DSP_LEVEL1MENU_1, _DEA_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelD1Menu_2Enter, LevelD1Menu_2Do, LevelD1Menu_2Exit}, /*03*/{ _DEA_DSP_LEVEL1_2MENU_1, _DEA_DSP_LEVEL1MENU_1, _DEA_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelD1Menu_2Enter, LevelD1Menu_2Do, LevelD1Menu_2Exit},
/*03*/{ _DEA_DSP_LEVEL1_3MENU_1, _DEA_DSP_LEVEL1MENU_2, _DEA_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelD1Menu_3Enter, LevelD1Menu_3Do, LevelD1Menu_3Exit}, /*04*/{ _DEA_DSP_LEVEL1_3MENU_1, _DEA_DSP_LEVEL1MENU_2, _DEA_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelD1Menu_3Enter, LevelD1Menu_3Do, LevelD1Menu_3Exit},
/*04*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelD1Menu_4Enter, LevelD1Menu_4Do, LevelD1Menu_4Exit}, /*05*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelD1Menu_4Enter, LevelD1Menu_4Do, LevelD1Menu_4Exit},
/*05*/{ _DEA_DSP_LEVEL2_5MENU_1, _DEA_DSP_LEVEL1MENU_4, _DEA_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelD1Menu_5Enter, LevelD1Menu_5Do, LevelD1Menu_5Exit}, /*06*/{ _DEA_DSP_LEVEL2_5MENU_1, _DEA_DSP_LEVEL1MENU_4, _DEA_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelD1Menu_5Enter, LevelD1Menu_5Do, LevelD1Menu_5Exit},
/*06*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit}, /*07*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit},
/*07*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelD1_1Menu_1Enter, LevelD1_1Menu_1Do, LevelD1_1Menu_1Exit}, /*08*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelD1_1Menu_1Enter, LevelD1_1Menu_1Do, LevelD1_1Menu_1Exit},
/*08*/{ _DEA_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, LevelD1_2Menu_1Enter, LevelD1_2Menu_1Do, LevelD1_2Menu_1Exit}, /*09*/{ _DEA_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, LevelD1_2Menu_1Enter, LevelD1_2Menu_1Do, LevelD1_2Menu_1Exit},
/*09*/{ _DEA_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_2MENU_1, LevelD1_2Menu_2Enter, LevelD1_2Menu_2Do, LevelD1_2Menu_2Exit}, /*10*/{ _DEA_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_2MENU_1, LevelD1_2Menu_2Enter, LevelD1_2Menu_2Do, LevelD1_2Menu_2Exit},
/*10*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_3Enter, LevelD1_2Menu_3Do, LevelD1_2Menu_3Exit}, /*11*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_3Enter, LevelD1_2Menu_3Do, LevelD1_2Menu_3Exit},
/*11*/{ _DEA_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_4Enter, LevelD1_2Menu_4Do, LevelD1_2Menu_4Exit}, /*12*/{ _DEA_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_4Enter, LevelD1_2Menu_4Do, LevelD1_2Menu_4Exit},
/*12*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_2, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_1Enter, LevelD1_3Menu_1Do, LevelD1_3Menu_1Exit}, /*13*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_2, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_1Enter, LevelD1_3Menu_1Do, LevelD1_3Menu_1Exit},
/*13*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_2Enter, LevelD1_3Menu_2Do, LevelD1_3Menu_2Exit}, /*14*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_2Enter, LevelD1_3Menu_2Do, LevelD1_3Menu_2Exit},
/*14*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*15*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*15*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit}, /*16*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*16*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit}, /*17*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*17*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit}, /*18*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*17*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_5, LevelD2_5Menu_1Enter, LevelD2_5Menu_1Do, LevelD2_5Menu_1Exit}, /*19*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_5, LevelD2_5Menu_1Enter, LevelD2_5Menu_1Do, LevelD2_5Menu_1Exit},
}; };
void NextMenu(_MENU_IDX idx) void NextMenu(_MENU_IDX idx)
{ {
......
source/Application/Graphic/UE/DisplaySch_user.c
View file @ 1c93b082
...@@ -443,7 +443,7 @@ void Meter_Mode_conversion(void) ...@@ -443,7 +443,7 @@ void Meter_Mode_conversion(void)
if (K_Line_Set.K_Line_LID51 == 0x01u) if (K_Line_Set.K_Line_LID51 == 0x01u)
{ {
popupID = Popup_Get_Current_Message(); popupID = Popup_Get_Current_Message();
if (popupID != 0xFFFFU) if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
{ {
MenuFlag.Menu_Popup_Flag = 0u; MenuFlag.Menu_Popup_Flag = 0u;
} }
...@@ -467,7 +467,7 @@ void Meter_Mode_conversion(void) ...@@ -467,7 +467,7 @@ void Meter_Mode_conversion(void)
if (K_Line_Set.K_Line_LID51 == 0x01u) if (K_Line_Set.K_Line_LID51 == 0x01u)
{ {
popupID = Popup_Get_Current_Message(); popupID = Popup_Get_Current_Message();
if (popupID != 0xFFFFU) if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
{ {
MenuFlag.Menu_Popup_Flag = 0u; MenuFlag.Menu_Popup_Flag = 0u;
} }
...@@ -491,7 +491,7 @@ void Meter_Mode_conversion(void) ...@@ -491,7 +491,7 @@ void Meter_Mode_conversion(void)
if ((DispVSpeed >= 66u) || (DispESpeed >= 330u)) if ((DispVSpeed >= 66u) || (DispESpeed >= 330u))
{ {
popupID = Popup_Get_Current_Message(); popupID = Popup_Get_Current_Message();
if (popupID != 0xFFFFU) if ((popupID != 0xffffu) && (MenuFlag.Key_Menu_Popup_time == 0x00u))
{ {
MenuFlag.Menu_Popup_Flag = 0u; MenuFlag.Menu_Popup_Flag = 0u;
} }
......
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