Commit fa07b866 authored by hu's avatar hu

增加DTC显示界面

parent a37fbb3c
...@@ -343,10 +343,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -343,10 +343,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
} }
} }
/*工厂模式*/ /*经销商模式*/ /*工厂模式*/ /*经销商模式*/
else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) || else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) || ((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
} }
...@@ -482,10 +480,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -482,10 +480,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
/*工厂模式*/ /*经销商模式*/ /*工厂模式*/ /*经销商模式*/
if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) || if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) || ((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
} }
...@@ -854,10 +850,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -854,10 +850,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
} }
} }
/*工厂模式*/ /*经销商模式*/ /*工厂模式*/ /*经销商模式*/
else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) || else if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) || ((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
} }
...@@ -1000,10 +994,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -1000,10 +994,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS) if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{ {
/*工厂模式*/ /*经销商模式*/ /*工厂模式*/ /*经销商模式*/
if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1MENU_6)) || if (((bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) ||
((bCurMenuIDX >= _FAC_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL1_3MENU_2)) || ((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
((bCurMenuIDX >= _DEA_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL1_3MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL1_3MENU_2)))
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
} }
......
...@@ -6982,6 +6982,147 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode) ...@@ -6982,6 +6982,147 @@ void GUI_BG_FacMenu6_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_Fty_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_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
if (bCurMenuIDX <= _FAC_DSP_LEVEL1_1MENU_4)
{
if (bCurMenuIDX != _FAC_DSP_LEVEL1_1MENU_1)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_13white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1_1MENU_2)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_14white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1_1MENU_3)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_15white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1_1MENU_4)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_16white, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else if (bCurMenuIDX == _FAC_DSP_LEVEL1_1MENU_5)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_14white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_15white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_16white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else if (bCurMenuIDX == _FAC_DSP_LEVEL1_1MENU_6)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_15white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_16white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_17white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_13black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_FacDTCMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_14black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_FacDTCMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_15black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_FacDTCMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_16black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_FacDTCMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_17black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_FacDTCMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_18black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_Display_DTC_Server * Function Name : GUI_Display_DTC_Server
* Description : * Description :
......
...@@ -456,6 +456,13 @@ void GUI_BG_FacMenu3_Display(uint8_t Mode); /**/ ...@@ -456,6 +456,13 @@ void GUI_BG_FacMenu3_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu4_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu4_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu5_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu5_Display(uint8_t Mode); /**/
void GUI_BG_FacMenu6_Display(uint8_t Mode); /**/ void GUI_BG_FacMenu6_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCMenu_Display(uint8_t Mode); /*工厂模式DTC显示*/
void GUI_BG_FacDTCMenu1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCMenu2_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCMenu3_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCMenu4_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCMenu5_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCMenu6_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClear1_Display(uint8_t Mode); /*工厂模式清除DTC1*/ void GUI_BG_FacDTCClear1_Display(uint8_t Mode); /*工厂模式清除DTC1*/
void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2*/ 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*/
......
...@@ -190,32 +190,60 @@ typedef enum ...@@ -190,32 +190,60 @@ typedef enum
_FAC_DSP_LEVEL2_5MENU_1, /* 134 是否结束工厂模式*/ _FAC_DSP_LEVEL2_5MENU_1, /* 134 是否结束工厂模式*/
/*经销商模式*/ /*经销商模式*/
_DEA_DSP_LEVEL0MENU_1, /*103 */ _DEA_DSP_LEVEL0MENU_1, /* 135 */
_DEA_DSP_LEVEL1MENU_1, /* 104 DTC显示*/ _DEA_DSP_LEVEL1MENU_1, /* 136 DTC显示*/
_DEA_DSP_LEVEL1MENU_2, /* 105 DTC清除*/ _DEA_DSP_LEVEL1MENU_2, /* 137 DTC清除*/
_DEA_DSP_LEVEL1MENU_3, /* 106 仪表设定显示*/ _DEA_DSP_LEVEL1MENU_3, /* 138 仪表设定显示*/
_DEA_DSP_LEVEL1MENU_4, /* 107 暂时通常模式*/ _DEA_DSP_LEVEL1MENU_4, /* 139 暂时通常模式*/
_DEA_DSP_LEVEL1MENU_5, /* 108 结束经销商模式*/ _DEA_DSP_LEVEL1MENU_5, /* 140 结束经销商模式*/
_DEA_DSP_LEVEL1MENU_6, /* 109 HID自动水平初始化*/ _DEA_DSP_LEVEL1MENU_6, /* 141 HID自动水平初始化*/
_DEA_DSP_LEVEL1_1MENU_1, /* 110 故障码读取中*/ _DEA_DSP_LEVEL1_1MENU_1, /* 142 发动机*/
_DEA_DSP_LEVEL1_2MENU_1, /* 111 清除所有DTC*/ _DEA_DSP_LEVEL1_1MENU_2, /* 143 变速箱AMT */
_DEA_DSP_LEVEL1_2MENU_2, /* 112 清除所有DTC*/ _DEA_DSP_LEVEL1_1MENU_3, /* 144 刹车EBS */
_DEA_DSP_LEVEL1_2MENU_3, /* 113 清除所有DTC*/ _DEA_DSP_LEVEL1_1MENU_4, /* 145 液缓 */
_DEA_DSP_LEVEL1_2MENU_4, /* 114 清除所有DTC*/ _DEA_DSP_LEVEL1_1MENU_5, /* 146 雷达 */
_DEA_DSP_LEVEL1_3MENU_1, /* 115 L0-7 H2-A*/ _DEA_DSP_LEVEL1_1MENU_6, /* 147 摄像头 */
_DEA_DSP_LEVEL1_3MENU_2, /* 116 L8-F H2-A*/
_DEA_DSP_LEVEL1_6MENU_1, /* 117 HID自动标准初始化*/ _DEA_DSP_LEVEL1_2MENU_1, /* 148 发动机*/
_DEA_DSP_LEVEL1_6MENU_2, /* 118 HID自动标准初始化*/ _DEA_DSP_LEVEL1_2MENU_2, /* 149 变速箱AMT */
_DEA_DSP_LEVEL1_2MENU_3, /* 150 刹车EBS */
_DEA_DSP_LEVEL2_1MENU_1, /* 119 */ _DEA_DSP_LEVEL1_2MENU_4, /* 151 液缓 */
_DEA_DSP_LEVEL2_1MENU_2, /* 120 */ _DEA_DSP_LEVEL1_2MENU_5, /* 152 雷达 */
_DEA_DSP_LEVEL2_1MENU_3, /* 121 */ _DEA_DSP_LEVEL1_2MENU_6, /* 153 摄像头 */
_DEA_DSP_LEVEL2_1MENU_4, /* 122 */
//_DEA_DSP_LEVEL1_2MENU_1, /* 1 清除所有DTC*/
_DEA_DSP_LEVEL2_5MENU_1, /* 123 是否结束经销商模式*/ //_DEA_DSP_LEVEL1_2MENU_2, /* 1 清除所有DTC*/
//_DEA_DSP_LEVEL1_2MENU_3, /* 1 清除所有DTC*/
//_DEA_DSP_LEVEL1_2MENU_4, /* 1 清除所有DTC*/
_DEA_DSP_LEVEL1_3MENU_1, /* 154 L0-7 H2-A*/
_DEA_DSP_LEVEL1_3MENU_2, /* 155 L8-F H2-A*/
_DEA_DSP_LEVEL1_6MENU_1, /* 156 HID自动标准初始化*/
_DEA_DSP_LEVEL1_6MENU_2, /* 157 HID自动标准初始化*/
_DEA_DSP_LEVEL2_1MENU_1, /* 158 发动机*/
_DEA_DSP_LEVEL2_1MENU_2, /* 159 变速箱AMT*/
_DEA_DSP_LEVEL2_1MENU_3, /* 160 刹车EBS*/
_DEA_DSP_LEVEL2_1MENU_4, /* 161 液缓*/
_DEA_DSP_LEVEL2_1MENU_5, /* 162 雷达*/
_DEA_DSP_LEVEL2_1MENU_6, /* 163 摄像头*/
_DEA_DSP_LEVEL2_2MENU_1, /* 164 是否发动机*/
_DEA_DSP_LEVEL2_2MENU_2, /* 165 是否变速箱AMT*/
_DEA_DSP_LEVEL2_2MENU_3, /* 166 是否刹车EBS*/
_DEA_DSP_LEVEL2_2MENU_4, /* 167 是否液缓*/
_DEA_DSP_LEVEL2_2MENU_5, /* 168 是否雷达*/
_DEA_DSP_LEVEL2_2MENU_6, /* 169 是否摄像头*/
_DEA_DSP_LEVEL3_2MENU_1, /* 170 是发动机*/
_DEA_DSP_LEVEL3_2MENU_2, /* 171 是变速箱AMT*/
_DEA_DSP_LEVEL3_2MENU_3, /* 172 是刹车EBS*/
_DEA_DSP_LEVEL3_2MENU_4, /* 173 是液缓*/
_DEA_DSP_LEVEL3_2MENU_5, /* 174 是雷达*/
_DEA_DSP_LEVEL3_2MENU_6, /* 175 是摄像头*/
_DEA_DSP_LEVEL2_5MENU_1, /* 176 是否结束经销商模式*/
_MN_DSP_MENU_MAX, _MN_DSP_MENU_MAX,
...@@ -680,6 +708,30 @@ EXTERN_MEU_PROCESS void LevelF1Menu_6Enter(void); ...@@ -680,6 +708,30 @@ EXTERN_MEU_PROCESS void LevelF1Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Do(void); EXTERN_MEU_PROCESS void LevelF1Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF1Menu_6Exit(void); EXTERN_MEU_PROCESS void LevelF1Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_1Enter(void); EXTERN_MEU_PROCESS void LevelF1_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_1Do(void); EXTERN_MEU_PROCESS void LevelF1_2Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_1Exit(void); EXTERN_MEU_PROCESS void LevelF1_2Menu_1Exit(void);
...@@ -696,6 +748,14 @@ EXTERN_MEU_PROCESS void LevelF1_2Menu_4Enter(void); ...@@ -696,6 +748,14 @@ EXTERN_MEU_PROCESS void LevelF1_2Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_4Do(void); EXTERN_MEU_PROCESS void LevelF1_2Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_4Exit(void); EXTERN_MEU_PROCESS void LevelF1_2Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF1_2Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF1_3Menu_1Enter(void); EXTERN_MEU_PROCESS void LevelF1_3Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_3Menu_1Do(void); EXTERN_MEU_PROCESS void LevelF1_3Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_3Menu_1Exit(void); EXTERN_MEU_PROCESS void LevelF1_3Menu_1Exit(void);
...@@ -712,21 +772,77 @@ EXTERN_MEU_PROCESS void LevelF1_6Menu_2Enter(void); ...@@ -712,21 +772,77 @@ EXTERN_MEU_PROCESS void LevelF1_6Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1_6Menu_2Do(void); EXTERN_MEU_PROCESS void LevelF1_6Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1_6Menu_2Exit(void); EXTERN_MEU_PROCESS void LevelF1_6Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Enter(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Do(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_1Exit(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Enter(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Do(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_2Exit(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Enter(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Do(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_3Exit(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Enter(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void); EXTERN_MEU_PROCESS void LevelF2_1Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF2_1Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF2_1Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF2_1Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF2_1Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF2_1Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF2_1Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF2_2Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF3_2Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Enter(void); EXTERN_MEU_PROCESS void LevelF2_5Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Do(void); EXTERN_MEU_PROCESS void LevelF2_5Menu_1Do(void);
......
...@@ -143,31 +143,60 @@ const _MenuOptTab MenuOptTab[] = ...@@ -143,31 +143,60 @@ const _MenuOptTab MenuOptTab[] =
/*92*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelMenuTest_Enter, LevelMenuTest_Do, LevelMenuTest_Exit}, /*92*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelMenuTest_Enter, LevelMenuTest_Do, LevelMenuTest_Exit},
/*工厂模式*/ /*工厂模式*/
/*82*/{ _FAC_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF0Menu_1Enter, LevelF0Menu_1Do, LevelF0Menu_1Exit}, /*93*/{ _FAC_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF0Menu_1Enter, LevelF0Menu_1Do, LevelF0Menu_1Exit},
/*83*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit}, /*94*/{ _FAC_DSP_LEVEL1_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, _MN_IDX_NULL, LevelF1Menu_1Enter, LevelF1Menu_1Do, LevelF1Menu_1Exit},
/*84*/{ _FAC_DSP_LEVEL1_2MENU_1, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit}, /*95*/{ _FAC_DSP_LEVEL1_2MENU_1, _FAC_DSP_LEVEL1MENU_1, _FAC_DSP_LEVEL1MENU_3, _MN_IDX_NULL, LevelF1Menu_2Enter, LevelF1Menu_2Do, LevelF1Menu_2Exit},
/*85*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit}, /*96*/{ _FAC_DSP_LEVEL1_3MENU_1, _FAC_DSP_LEVEL1MENU_2, _FAC_DSP_LEVEL1MENU_4, _MN_IDX_NULL, LevelF1Menu_3Enter, LevelF1Menu_3Do, LevelF1Menu_3Exit},
/*86*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit}, /*97*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, LevelF1Menu_4Enter, LevelF1Menu_4Do, LevelF1Menu_4Exit},
/*87*/{ _FAC_DSP_LEVEL2_5MENU_1, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit}, /*98*/{ _FAC_DSP_LEVEL2_5MENU_1, _FAC_DSP_LEVEL1MENU_4, _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, LevelF1Menu_5Enter, LevelF1Menu_5Do, LevelF1Menu_5Exit},
/*88*/{ _FAC_DSP_LEVEL1_6MENU_1, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit}, /*99*/{ _FAC_DSP_LEVEL1_6MENU_1, _FAC_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1Menu_6Enter, LevelF1Menu_6Do, LevelF1Menu_6Exit},
/*89*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*00*/{ _FAC_DSP_LEVEL2_1MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_2, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit},
/*90*/{ _FAC_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit}, /*01*/{ _FAC_DSP_LEVEL2_1MENU_2, _FAC_DSP_LEVEL1_1MENU_1, _FAC_DSP_LEVEL1_1MENU_3, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit},
/*91*/{ _FAC_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_1, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit}, /*02*/{ _FAC_DSP_LEVEL2_1MENU_3, _FAC_DSP_LEVEL1_1MENU_2, _FAC_DSP_LEVEL1_1MENU_4, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit},
/*92*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_3Enter, LevelF1_2Menu_3Do, LevelF1_2Menu_3Exit}, /*03*/{ _FAC_DSP_LEVEL2_1MENU_4, _FAC_DSP_LEVEL1_1MENU_3, _FAC_DSP_LEVEL1_1MENU_5, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*93*/{ _FAC_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_4Enter, LevelF1_2Menu_4Do, LevelF1_2Menu_4Exit}, /*04*/{ _FAC_DSP_LEVEL2_1MENU_5, _FAC_DSP_LEVEL1_1MENU_4, _FAC_DSP_LEVEL1_1MENU_6, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_5Enter, LevelF1_1Menu_5Do, LevelF1_1Menu_5Exit},
/*94*/{ _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_2, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit}, /*05*/{ _FAC_DSP_LEVEL2_1MENU_6, _FAC_DSP_LEVEL1_1MENU_5, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_6Enter, LevelF1_1Menu_6Do, LevelF1_1Menu_6Exit},
/*95*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*96*/{ _FAC_DSP_LEVEL1_6MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_6, LevelF1_6Menu_1Enter, LevelF1_6Menu_1Do, LevelF1_6Menu_1Exit}, /*06*/{ _FAC_DSP_LEVEL2_2MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*97*/{ _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_6MENU_1, LevelF1_6Menu_2Enter, LevelF1_6Menu_2Do, LevelF1_6Menu_2Exit}, /*07*/{ _FAC_DSP_LEVEL2_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*08*/{ _FAC_DSP_LEVEL2_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_3Enter, LevelF1_2Menu_3Do, LevelF1_2Menu_3Exit},
/*98*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_1Enter, LevelF1_1Menu_1Do, LevelF1_1Menu_1Exit}, /*09*/{ _FAC_DSP_LEVEL2_2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_4Enter, LevelF1_2Menu_4Do, LevelF1_2Menu_4Exit},
/*99*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_2Enter, LevelF1_1Menu_2Do, LevelF1_1Menu_2Exit}, /*10*/{ _FAC_DSP_LEVEL2_2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_5Enter, LevelF1_2Menu_5Do, LevelF1_2Menu_5Exit},
/*00*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_3Enter, LevelF1_1Menu_3Do, LevelF1_1Menu_3Exit}, /*11*/{ _FAC_DSP_LEVEL2_2MENU_6, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_6Enter, LevelF1_2Menu_6Do, LevelF1_2Menu_6Exit},
/*01*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_1, LevelF1_1Menu_4Enter, LevelF1_1Menu_4Do, LevelF1_1Menu_4Exit},
/*90*///{ _FAC_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*02*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, LevelF2_5Menu_1Enter, LevelF2_5Menu_1Do, LevelF2_5Menu_1Exit}, /*91*///{ _FAC_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_1, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*92*///{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_3Enter, LevelF1_2Menu_3Do, LevelF1_2Menu_3Exit},
/*93*///{ _FAC_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF1_2Menu_4Enter, LevelF1_2Menu_4Do, LevelF1_2Menu_4Exit},
/*12*/{ _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_2, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_1Enter, LevelF1_3Menu_1Do, LevelF1_3Menu_1Exit},
/*13*/{ _MN_IDX_NULL, _FAC_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_3, LevelF1_3Menu_2Enter, LevelF1_3Menu_2Do, LevelF1_3Menu_2Exit},
/*14*/{ _FAC_DSP_LEVEL1_6MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_6, LevelF1_6Menu_1Enter, LevelF1_6Menu_1Do, LevelF1_6Menu_1Exit},
/*15*/{ _FAC_DSP_LEVEL1MENU_6, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_6MENU_1, LevelF1_6Menu_2Enter, LevelF1_6Menu_2Do, LevelF1_6Menu_2Exit},
/*16*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_1, LevelF2_1Menu_1Enter, LevelF2_1Menu_1Do, LevelF2_1Menu_1Exit},
/*17*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_2, LevelF2_1Menu_2Enter, LevelF2_1Menu_2Do, LevelF2_1Menu_2Exit},
/*18*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_3, LevelF2_1Menu_3Enter, LevelF2_1Menu_3Do, LevelF2_1Menu_3Exit},
/*19*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_4, LevelF2_1Menu_4Enter, LevelF2_1Menu_4Do, LevelF2_1Menu_4Exit},
/*20*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_5, LevelF2_1Menu_5Enter, LevelF2_1Menu_5Do, LevelF2_1Menu_5Exit},
/*21*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_1MENU_6, LevelF2_1Menu_6Enter, LevelF2_1Menu_6Do, LevelF2_1Menu_6Exit},
/*22*/{ _FAC_DSP_LEVEL3_2MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_1, LevelF2_2Menu_1Enter, LevelF2_2Menu_1Do, LevelF2_2Menu_1Exit},
/*23*/{ _FAC_DSP_LEVEL3_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_2, LevelF2_2Menu_2Enter, LevelF2_2Menu_2Do, LevelF2_2Menu_2Exit},
/*24*/{ _FAC_DSP_LEVEL3_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_3, LevelF2_2Menu_3Enter, LevelF2_2Menu_3Do, LevelF2_2Menu_3Exit},
/*25*/{ _FAC_DSP_LEVEL3_2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_4, LevelF2_2Menu_4Enter, LevelF2_2Menu_4Do, LevelF2_2Menu_4Exit},
/*26*/{ _FAC_DSP_LEVEL3_2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_5, LevelF2_2Menu_5Enter, LevelF2_2Menu_5Do, LevelF2_2Menu_5Exit},
/*27*/{ _FAC_DSP_LEVEL3_2MENU_6, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_6, LevelF2_2Menu_6Enter, LevelF2_2Menu_6Do, LevelF2_2Menu_6Exit},
/*28*/{ _FAC_DSP_LEVEL2_2MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_1Enter, LevelF3_2Menu_1Do, LevelF3_2Menu_1Exit},
/*29*/{ _FAC_DSP_LEVEL2_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_2Enter, LevelF3_2Menu_2Do, LevelF3_2Menu_2Exit},
/*30*/{ _FAC_DSP_LEVEL2_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_3Enter, LevelF3_2Menu_3Do, LevelF3_2Menu_3Exit},
/*31*/{ _FAC_DSP_LEVEL2_2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_4Enter, LevelF3_2Menu_4Do, LevelF3_2Menu_4Exit},
/*32*/{ _FAC_DSP_LEVEL2_2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_5Enter, LevelF3_2Menu_5Do, LevelF3_2Menu_5Exit},
/*33*/{ _FAC_DSP_LEVEL2_2MENU_6, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_6Enter, LevelF3_2Menu_6Do, LevelF3_2Menu_6Exit},
/*34*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_5, LevelF2_5Menu_1Enter, LevelF2_5Menu_1Do, LevelF2_5Menu_1Exit},
/*经销商模式*/ /*经销商模式*/
/*03*/{ _DEA_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD0Menu_1Enter, LevelD0Menu_1Do, LevelD0Menu_1Exit}, /*03*/{ _DEA_DSP_LEVEL1MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD0Menu_1Enter, LevelD0Menu_1Do, LevelD0Menu_1Exit},
...@@ -180,10 +209,10 @@ const _MenuOptTab MenuOptTab[] = ...@@ -180,10 +209,10 @@ const _MenuOptTab MenuOptTab[] =
/*09*/{ _DEA_DSP_LEVEL1_6MENU_1, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit}, /*09*/{ _DEA_DSP_LEVEL1_6MENU_1, _DEA_DSP_LEVEL1MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1Menu_6Enter, LevelD1Menu_6Do, LevelD1Menu_6Exit},
/*10*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelD1_1Menu_1Enter, LevelD1_1Menu_1Do, LevelD1_1Menu_1Exit}, /*10*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_1, LevelD1_1Menu_1Enter, LevelD1_1Menu_1Do, LevelD1_1Menu_1Exit},
/*11*/{ _DEA_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, LevelD1_2Menu_1Enter, LevelD1_2Menu_1Do, LevelD1_2Menu_1Exit}, /*11*///{ _DEA_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_2, LevelD1_2Menu_1Enter, LevelD1_2Menu_1Do, LevelD1_2Menu_1Exit},
/*12*/{ _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}, /*12*///{ _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},
/*13*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_3Enter, LevelD1_2Menu_3Do, LevelD1_2Menu_3Exit}, /*13*///{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_3Enter, LevelD1_2Menu_3Do, LevelD1_2Menu_3Exit},
/*14*/{ _DEA_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_4Enter, LevelD1_2Menu_4Do, LevelD1_2Menu_4Exit}, /*14*///{ _DEA_DSP_LEVEL0MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelD1_2Menu_4Enter, LevelD1_2Menu_4Do, LevelD1_2Menu_4Exit},
/*15*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_2, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_1Enter, LevelD1_3Menu_1Do, LevelD1_3Menu_1Exit}, /*15*/{ _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_2, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_1Enter, LevelD1_3Menu_1Do, LevelD1_3Menu_1Exit},
/*16*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_2Enter, LevelD1_3Menu_2Do, LevelD1_3Menu_2Exit}, /*16*/{ _MN_IDX_NULL, _DEA_DSP_LEVEL1_3MENU_1, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_3, LevelD1_3Menu_2Enter, LevelD1_3Menu_2Do, LevelD1_3Menu_2Exit},
/*17*/{ _DEA_DSP_LEVEL1_6MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_6, LevelD1_6Menu_1Enter, LevelD1_6Menu_1Do, LevelD1_6Menu_1Exit}, /*17*/{ _DEA_DSP_LEVEL1_6MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _DEA_DSP_LEVEL1MENU_6, LevelD1_6Menu_1Enter, LevelD1_6Menu_1Do, LevelD1_6Menu_1Exit},
...@@ -2023,27 +2052,7 @@ void LevelF0Menu_1Exit(void) ...@@ -2023,27 +2052,7 @@ void LevelF0Menu_1Exit(void)
/*----工厂模式----DTC显示-----*/ /*----工厂模式----DTC显示-----*/
void LevelF1Menu_1Enter(void) void LevelF1Menu_1Enter(void)
{ {}
//03 19 02 0C 55 55 55 55
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u;
canMag.MsgRTR = 0u;
canMag.Msg[0u] = 0x03u;
canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x00u;
Can_Write(&canMag);
}
void LevelF1Menu_1Do(void) void LevelF1Menu_1Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
...@@ -2116,58 +2125,12 @@ void LevelF1Menu_6Exit(void) ...@@ -2116,58 +2125,12 @@ void LevelF1Menu_6Exit(void)
/**/ /**/
/*----工厂模式----DTC显示----发动机故障*-----*/ /*----工厂模式----DTC显示----发动机故障*-----*/
void LevelF1_1Menu_1Enter(void) void LevelF1_1Menu_1Enter(void)
{ {}
//03 19 02 0C 55 55 55 55
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u;
canMag.MsgRTR = 0u;
canMag.Msg[0u] = 0x03u;
canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x00u;
Can_Write(&canMag);
Menu_DTC_DisTime = 20u;
}
void LevelF1_1Menu_1Do(void) void LevelF1_1Menu_1Do(void)
{ {
uint8_t DTCNumDis = 0x00u;
if (Menu_DTC_DisTime != 0x00u)
{
Menu_DTC_DisTime--;
}
if (Menu_DTC_DisTime == 0u)
{
DTCNumDis = 1u;
}
else
{
DTCNumDis = 0u;
}
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_FacDTCMenu_Display(GUI_DISP_MODE_NORMAL);
if (DTCNumDis == 1u) /*计时*/ GUI_BG_FacDTCMenu1_Display(GUI_DISP_MODE_NORMAL);
{
GUI_Display_DTC_Server();
//GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL);
}
else /*故障码读取中*/
{
//GUI_BG_DTCReading_Display(GUI_DISP_MODE_NORMAL);
}
} }
void LevelF1_1Menu_1Exit(void) void LevelF1_1Menu_1Exit(void)
{} {}
...@@ -2178,7 +2141,9 @@ void LevelF1_1Menu_2Enter(void) ...@@ -2178,7 +2141,9 @@ void LevelF1_1Menu_2Enter(void)
void LevelF1_1Menu_2Do(void) void LevelF1_1Menu_2Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_DTCSCR_Display(GUI_DISP_MODE_NORMAL); GUI_BG_FacDTCMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCMenu2_Display(GUI_DISP_MODE_NORMAL);
} }
void LevelF1_1Menu_2Exit(void) void LevelF1_1Menu_2Exit(void)
{} {}
...@@ -2189,7 +2154,8 @@ void LevelF1_1Menu_3Enter(void) ...@@ -2189,7 +2154,8 @@ void LevelF1_1Menu_3Enter(void)
void LevelF1_1Menu_3Do(void) void LevelF1_1Menu_3Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_DTCAMT_Display(GUI_DISP_MODE_NORMAL); GUI_BG_FacDTCMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCMenu3_Display(GUI_DISP_MODE_NORMAL);
} }
void LevelF1_1Menu_3Exit(void) void LevelF1_1Menu_3Exit(void)
{} {}
...@@ -2200,85 +2166,156 @@ void LevelF1_1Menu_4Enter(void) ...@@ -2200,85 +2166,156 @@ void LevelF1_1Menu_4Enter(void)
void LevelF1_1Menu_4Do(void) void LevelF1_1Menu_4Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_FacDTCMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCMenu4_Display(GUI_DISP_MODE_NORMAL);
} }
void LevelF1_1Menu_4Exit(void) void LevelF1_1Menu_4Exit(void)
{} {}
void LevelF1_1Menu_5Enter(void)
{}
void LevelF1_1Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCMenu5_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_1Menu_5Exit(void)
{}
void LevelF1_1Menu_6Enter(void)
{}
void LevelF1_1Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCMenu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCMenu6_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_1Menu_6Exit(void)
{}
/*----工厂模式----DTC清除1----所有DTC全部清除-----*/ /*----工厂模式----DTC显示----发动机故障*-----*/
void LevelF1_2Menu_1Enter(void) void LevelF1_2Menu_1Enter(void)
{} {}
void LevelF1_2Menu_1Do(void) void LevelF1_2Menu_1Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
GUI_BG_FacDTCClear1_Display(GUI_DISP_MODE_NORMAL); GUI_BG_DTCSCR_Display(GUI_DISP_MODE_NORMAL);
} }
void LevelF1_2Menu_1Exit(void) void LevelF1_2Menu_1Exit(void)
{} {}
/*----工厂模式----DTC清除2----清除DTC全部-----*/
void LevelF1_2Menu_2Enter(void) void LevelF1_2Menu_2Enter(void)
{} {}
void LevelF1_2Menu_2Do(void) void LevelF1_2Menu_2Do(void)
{ {}
GUI_OftenShow_Display();
GUI_BG_FacDTCClear2_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_2Exit(void) void LevelF1_2Menu_2Exit(void)
{} {}
/*----工厂模式----DTC清除3----清除DTC全部-----*/
void LevelF1_2Menu_3Enter(void) void LevelF1_2Menu_3Enter(void)
{ {}
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u;
canMag.MsgRTR = 0u;
canMag.Msg[0u] = 0x04u;
canMag.Msg[1u] = 0x14u;
canMag.Msg[2u] = 0xFFu;
canMag.Msg[3u] = 0xFFu;
canMag.Msg[4u] = 0xFFu;
canMag.Msg[5u] = 0x55u;
canMag.Msg[6u] = 0x55u;
canMag.Msg[7u] = 0x55u;
Can_Write(&canMag);
Common_Set_LDWS_Flag_Sta(7);
}
void LevelF1_2Menu_3Do(void) void LevelF1_2Menu_3Do(void)
{ {}
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClear3_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL1_2MENU_4);
bCurMenuIDX = _FAC_DSP_LEVEL1_2MENU_4;
}
}
void LevelF1_2Menu_3Exit(void) void LevelF1_2Menu_3Exit(void)
{} {}
/*----工厂模式----DTC清除4----清除DTC全部-----*/
void LevelF1_2Menu_4Enter(void) void LevelF1_2Menu_4Enter(void)
{} {}
void LevelF1_2Menu_4Do(void) void LevelF1_2Menu_4Do(void)
{ {}
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_4Exit(void) void LevelF1_2Menu_4Exit(void)
{} {}
void LevelF1_2Menu_5Enter(void)
{}
void LevelF1_2Menu_5Do(void)
{}
void LevelF1_2Menu_5Exit(void)
{}
void LevelF1_2Menu_6Enter(void)
{}
void LevelF1_2Menu_6Do(void)
{}
void LevelF1_2Menu_6Exit(void)
{}
///*----工厂模式----DTC清除1----所有DTC全部清除-----*/
//void LevelF1_2Menu_1Enter(void)
//{}
//void LevelF1_2Menu_1Do(void)
//{
// GUI_OftenShow_Display();
// GUI_BG_FacDTCClear1_Display(GUI_DISP_MODE_NORMAL);
//}
//void LevelF1_2Menu_1Exit(void)
//{}
//
///*----工厂模式----DTC清除2----清除DTC全部-----*/
//void LevelF1_2Menu_2Enter(void)
//{}
//void LevelF1_2Menu_2Do(void)
//{
// GUI_OftenShow_Display();
// GUI_BG_FacDTCClear2_Display(GUI_DISP_MODE_NORMAL);
//}
//void LevelF1_2Menu_2Exit(void)
//{}
//
///*----工厂模式----DTC清除3----清除DTC全部-----*/
//void LevelF1_2Menu_3Enter(void)
//{
// _CAN_Msg canMag;
//
// canMag.MsgID = 0x7E0u;
// canMag.MsgDLC = 8u;
// canMag.MsgPro = 1u;//0u;
// canMag.MsgStd = 0u;
// canMag.MsgRTR = 0u;
//
// canMag.Msg[0u] = 0x04u;
// canMag.Msg[1u] = 0x14u;
// canMag.Msg[2u] = 0xFFu;
// canMag.Msg[3u] = 0xFFu;
// canMag.Msg[4u] = 0xFFu;
// canMag.Msg[5u] = 0x55u;
// canMag.Msg[6u] = 0x55u;
// canMag.Msg[7u] = 0x55u;
//
// Can_Write(&canMag);
//
// Common_Set_LDWS_Flag_Sta(7);
//}
//void LevelF1_2Menu_3Do(void)
//{
// GUI_OftenShow_Display();
//
// if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
// {
// GUI_BG_FacDTCClear3_Display(GUI_DISP_MODE_NORMAL);
// }
// else
// {
// Common_Set_Menu_FacDea_Time_Sta(0u);
// NextMenu(_FAC_DSP_LEVEL1_2MENU_4);
// bCurMenuIDX = _FAC_DSP_LEVEL1_2MENU_4;
// }
//}
//void LevelF1_2Menu_3Exit(void)
//{}
//
///*----工厂模式----DTC清除4----清除DTC全部-----*/
//void LevelF1_2Menu_4Enter(void)
//{}
//void LevelF1_2Menu_4Do(void)
//{
// GUI_OftenShow_Display();
// GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
//}
//void LevelF1_2Menu_4Exit(void)
//{}
/*----工厂模式----仪表设定显示----L0-7 H2-A-----*/ /*----工厂模式----仪表设定显示----L0-7 H2-A-----*/
void LevelF1_3Menu_1Enter(void) void LevelF1_3Menu_1Enter(void)
{} {}
...@@ -2323,6 +2360,182 @@ void LevelF1_6Menu_2Do(void) ...@@ -2323,6 +2360,182 @@ void LevelF1_6Menu_2Do(void)
void LevelF1_6Menu_2Exit(void) void LevelF1_6Menu_2Exit(void)
{} {}
/*----工厂模式---- 116发动机----*/
void LevelF2_1Menu_1Enter(void)
{
//03 19 02 0C 55 55 55 55
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u;
canMag.MsgRTR = 0u;
canMag.Msg[0u] = 0x03u;
canMag.Msg[1u] = 0x19u;
canMag.Msg[2u] = 0x02u;
canMag.Msg[3u] = 0x0Cu;
canMag.Msg[4u] = 0x00u;
canMag.Msg[5u] = 0x00u;
canMag.Msg[6u] = 0x00u;
canMag.Msg[7u] = 0x00u;
Can_Write(&canMag);
Menu_DTC_DisTime = 50u;
}
void LevelF2_1Menu_1Do(void)
{
uint8_t DTCNumDis = 0x00u;
if (Menu_DTC_DisTime != 0x00u)
{
Menu_DTC_DisTime--;
}
if (Menu_DTC_DisTime == 0u)
{
DTCNumDis = 1u;
}
else
{
DTCNumDis = 0u;
}
GUI_OftenShow_Display();
if (DTCNumDis == 1u) /*计时*/
{
//GUI_Display_DTC_Server();
GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL);
}
else /*故障码读取中*/
{
GUI_BG_DTCReading_Display(GUI_DISP_MODE_NORMAL);
}
}
void LevelF2_1Menu_1Exit(void)
{}
void LevelF2_1Menu_2Enter(void)
{}
void LevelF2_1Menu_2Do(void)
{}
void LevelF2_1Menu_2Exit(void)
{}
void LevelF2_1Menu_3Enter(void)
{}
void LevelF2_1Menu_3Do(void)
{}
void LevelF2_1Menu_3Exit(void)
{}
void LevelF2_1Menu_4Enter(void)
{}
void LevelF2_1Menu_4Do(void)
{}
void LevelF2_1Menu_4Exit(void)
{}
void LevelF2_1Menu_5Enter(void)
{}
void LevelF2_1Menu_5Do(void)
{}
void LevelF2_1Menu_5Exit(void)
{}
void LevelF2_1Menu_6Enter(void)
{}
void LevelF2_1Menu_6Do(void)
{}
void LevelF2_1Menu_6Exit(void)
{}
void LevelF2_2Menu_1Enter(void)
{}
void LevelF2_2Menu_1Do(void)
{}
void LevelF2_2Menu_1Exit(void)
{}
void LevelF2_2Menu_2Enter(void)
{}
void LevelF2_2Menu_2Do(void)
{}
void LevelF2_2Menu_2Exit(void)
{}
void LevelF2_2Menu_3Enter(void)
{}
void LevelF2_2Menu_3Do(void)
{}
void LevelF2_2Menu_3Exit(void)
{}
void LevelF2_2Menu_4Enter(void)
{}
void LevelF2_2Menu_4Do(void)
{}
void LevelF2_2Menu_4Exit(void)
{}
void LevelF2_2Menu_5Enter(void)
{}
void LevelF2_2Menu_5Do(void)
{}
void LevelF2_2Menu_5Exit(void)
{}
void LevelF2_2Menu_6Enter(void)
{}
void LevelF2_2Menu_6Do(void)
{}
void LevelF2_2Menu_6Exit(void)
{}
void LevelF3_2Menu_1Enter(void)
{}
void LevelF3_2Menu_1Do(void)
{}
void LevelF3_2Menu_1Exit(void)
{}
void LevelF3_2Menu_2Enter(void)
{}
void LevelF3_2Menu_2Do(void)
{}
void LevelF3_2Menu_2Exit(void)
{}
void LevelF3_2Menu_3Enter(void)
{}
void LevelF3_2Menu_3Do(void)
{}
void LevelF3_2Menu_3Exit(void)
{}
void LevelF3_2Menu_4Enter(void)
{}
void LevelF3_2Menu_4Do(void)
{}
void LevelF3_2Menu_4Exit(void)
{}
void LevelF3_2Menu_5Enter(void)
{}
void LevelF3_2Menu_5Do(void)
{}
void LevelF3_2Menu_5Exit(void)
{}
void LevelF3_2Menu_6Enter(void)
{}
void LevelF3_2Menu_6Do(void)
{}
void LevelF3_2Menu_6Exit(void)
{}
/*----工厂模式----是否结束工厂模式-----*/ /*----工厂模式----是否结束工厂模式-----*/
void LevelF2_5Menu_1Enter(void) void LevelF2_5Menu_1Enter(void)
{} {}
...@@ -2485,12 +2698,12 @@ void LevelD1_1Menu_1Do(void) ...@@ -2485,12 +2698,12 @@ void LevelD1_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); GUI_BG_DTCEngine_Display(GUI_DISP_MODE_NORMAL);
} }
else /*故障码读取中*/ else /*故障码读取中*/
{ {
//GUI_BG_DTCReading_Display(GUI_DISP_MODE_NORMAL); GUI_BG_DTCReading_Display(GUI_DISP_MODE_NORMAL);
} }
} }
void LevelD1_1Menu_1Exit(void) void LevelD1_1Menu_1Exit(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