Skip to content

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

增加DTC清除界面显示

parent fa2b12e1
Hide whitespace changes
Inline Side-by-side
Showing with 718 additions and 60 deletions
source/Application/Graphic/GUI/GUI.c
View file @ 97efa416
......@@ -295,7 +295,7 @@ void GUI_Display_Value_Init(void)
Display_DTC[2u].Disp_Mod_Menu_Cbk = GUI_BG_DTCAMT_Display; /*变速箱故障*/
Display_DTC[3u].Disp_Mod_Menu_Cbk = GUI_BG_DTCRadar_Display; /*雷达故障码*/
Display_DTC[4u].Disp_Mod_Menu_Cbk = GUI_BG_DTCCamera_Display; /*摄像头故障码*/
Display_DTC[5u].Disp_Mod_Menu_Cbk = GUI_BG_DTCIntarder_Display; /*液力缓速器故障码*/
Display_DTC[5u].Disp_Mod_Menu_Cbk = GUI_BG_DTCRetarder_Display; /*液力缓速器故障码*/
Display_DTC[6u].Disp_Mod_Menu_Cbk = GUI_Display_NULL; /*无故障*/
DPD_Display_Time = 0u;
......@@ -8212,14 +8212,14 @@ void GUI_BG_MenuDTCCamera_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_DTCIntarder_Display
* Function Name : GUI_BG_DTCRetarder_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DTCIntarder_Display(uint8_t Mode)
void GUI_BG_DTCRetarder_Display(uint8_t Mode)
{
uint8_t DTCNumCode = 0u;
uint32_t DTNumValue = 0u;
......@@ -8392,6 +8392,305 @@ void GUI_Display_NULL(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearEngine_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearEngine_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_07white, 300u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearBrake_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearBrake_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_08white, 316u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearAMT_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearAMT_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_09white, 300u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearRadar_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearRadar_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_10white, 316u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearCamer_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearCamer_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_11white, 300u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearRetarder_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearRetarder_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_12white, 268u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_white_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearEngine1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearEngine1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_07white, 300u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearBrake1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearBrake1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_08white, 316u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearAMT1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearAMT1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_09white, 300u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearRadar1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearRadar1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_10white, 316u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearCamer1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearCamer1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_11white, 300u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearRetarder1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearRetarder1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_12white, 268u, 97u, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_3, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_yes, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_grey_no, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClear1_Display
* Description :
......
source/Application/Graphic/GUI/GUI.h
View file @ 97efa416
......@@ -470,6 +470,20 @@ void GUI_BG_FacDTCClearC_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearD_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearE_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearF_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearEngine_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearBrake_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearAMT_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearRadar_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearCamer_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearRetarder_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearEngine1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearBrake1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearAMT1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearRadar1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearCamer1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearRetarder1_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClear1_Display(uint8_t Mode); /*工厂模式清除DTC1*/
void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacDTCClear3_Display(uint8_t Mode); /*工厂模式清除DTC2*/
......@@ -508,7 +522,7 @@ void GUI_BG_DTCBrake_Display(uint8_t Mode); /*刹车故障*/
void GUI_BG_DTCAMT_Display(uint8_t Mode); /*变速箱故障*/
void GUI_BG_DTCRadar_Display(uint8_t Mode); /*雷达故障码*/
void GUI_BG_DTCCamera_Display(uint8_t Mode); /*摄像头故障码*/
void GUI_BG_DTCIntarder_Display(uint8_t Mode); /*液力缓速器故障码*/
void GUI_BG_DTCRetarder_Display(uint8_t Mode); /*液力缓速器故障码*/
void GUI_BG_DTCSCR_Display(uint8_t Mode); /*SCR故障*/
void GUI_Display_NULL(uint8_t Mode); /*无故障码*/
......
source/Application/Graphic/Menu/Menu.h
View file @ 97efa416
......@@ -173,21 +173,28 @@ typedef enum
_FAC_DSP_LEVEL2_1MENU_5, /* 120 摄像头*/
_FAC_DSP_LEVEL2_1MENU_6, /* 121 液缓*/
_FAC_DSP_LEVEL2_2MENU_1, /* 122 是否发动机*/
_FAC_DSP_LEVEL2_2MENU_2, /* 123 是否刹车EBS*/
_FAC_DSP_LEVEL2_2MENU_3, /* 124 是否变速箱AMT*/
_FAC_DSP_LEVEL2_2MENU_4, /* 125 是否雷达*/
_FAC_DSP_LEVEL2_2MENU_5, /* 126 是否摄像头*/
_FAC_DSP_LEVEL2_2MENU_6, /* 127 是否液缓*/
_FAC_DSP_LEVEL3_2MENU_1, /* 128 是发动机*/
_FAC_DSP_LEVEL3_2MENU_2, /* 129 是刹车EBS*/
_FAC_DSP_LEVEL3_2MENU_3, /* 130 是变速箱AMT*/
_FAC_DSP_LEVEL3_2MENU_4, /* 131 是雷达*/
_FAC_DSP_LEVEL3_2MENU_5, /* 132 是摄像头*/
_FAC_DSP_LEVEL3_2MENU_6, /* 133 是液缓*/
_FAC_DSP_LEVEL2_5MENU_1, /* 134 是否结束工厂模式*/
_FAC_DSP_LEVEL2_2MENU_1, /* 122 是否清除白发动机*/
_FAC_DSP_LEVEL2_2MENU_2, /* 123 是否清除白刹车EBS*/
_FAC_DSP_LEVEL2_2MENU_3, /* 124 是否清除白变速箱AMT*/
_FAC_DSP_LEVEL2_2MENU_4, /* 125 是否清除白雷达*/
_FAC_DSP_LEVEL2_2MENU_5, /* 126 是否清除白摄像头*/
_FAC_DSP_LEVEL2_2MENU_6, /* 127 是否清除白液缓*/
_FAC_DSP_LEVEL3_2MENU_1, /* 128 是灰发动机*/
_FAC_DSP_LEVEL3_2MENU_2, /* 129 是灰刹车EBS*/
_FAC_DSP_LEVEL3_2MENU_3, /* 130 是灰变速箱AMT*/
_FAC_DSP_LEVEL3_2MENU_4, /* 131 是灰雷达*/
_FAC_DSP_LEVEL3_2MENU_5, /* 132 是灰摄像头*/
_FAC_DSP_LEVEL3_2MENU_6, /* 133 是灰液缓*/
_FAC_DSP_LEVEL4_2MENU_1, /* 134 已清除灰发动机*/
_FAC_DSP_LEVEL4_2MENU_2, /* 135 已清除灰刹车EBS*/
_FAC_DSP_LEVEL4_2MENU_3, /* 136 已清除灰变速箱AMT*/
_FAC_DSP_LEVEL4_2MENU_4, /* 137 已清除灰雷达*/
_FAC_DSP_LEVEL4_2MENU_5, /* 138 已清除灰摄像头*/
_FAC_DSP_LEVEL4_2MENU_6, /* 139 已清除灰液缓*/
_FAC_DSP_LEVEL2_5MENU_1, /* 140 是否结束工厂模式*/
/*经销商模式*/
_DEA_DSP_LEVEL0MENU_1, /* 135 */
......@@ -229,21 +236,28 @@ typedef enum
_DEA_DSP_LEVEL2_1MENU_5, /* 162 摄像头*/
_DEA_DSP_LEVEL2_1MENU_6, /* 163 液缓*/
_DEA_DSP_LEVEL2_2MENU_1, /* 164 是否发动机*/
_DEA_DSP_LEVEL2_2MENU_2, /* 165 是否刹车EBS*/
_DEA_DSP_LEVEL2_2MENU_3, /* 166 是否变速箱AMT*/
_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 是刹车EBS*/
_DEA_DSP_LEVEL3_2MENU_3, /* 172 是变速箱AMT*/
_DEA_DSP_LEVEL3_2MENU_4, /* 173 是雷达*/
_DEA_DSP_LEVEL3_2MENU_5, /* 174 是摄像头*/
_DEA_DSP_LEVEL3_2MENU_6, /* 175 是液缓*/
_DEA_DSP_LEVEL2_5MENU_1, /* 176 是否结束经销商模式*/
_DEA_DSP_LEVEL2_2MENU_1, /* 164 是否白发动机*/
_DEA_DSP_LEVEL2_2MENU_2, /* 165 是否白刹车EBS*/
_DEA_DSP_LEVEL2_2MENU_3, /* 166 是否白变速箱AMT*/
_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 是灰刹车EBS*/
_DEA_DSP_LEVEL3_2MENU_3, /* 172 是灰变速箱AMT*/
_DEA_DSP_LEVEL3_2MENU_4, /* 173 是灰雷达*/
_DEA_DSP_LEVEL3_2MENU_5, /* 174 是灰摄像头*/
_DEA_DSP_LEVEL3_2MENU_6, /* 175 是灰液缓*/
_DEA_DSP_LEVEL4_2MENU_1, /* 176 已清除发动机*/
_DEA_DSP_LEVEL4_2MENU_2, /* 177 已清除刹车EBS*/
_DEA_DSP_LEVEL4_2MENU_3, /* 178 已清除变速箱AMT*/
_DEA_DSP_LEVEL4_2MENU_4, /* 179 已清除雷达*/
_DEA_DSP_LEVEL4_2MENU_5, /* 180 已清除摄像头*/
_DEA_DSP_LEVEL4_2MENU_6, /* 181 已清除液缓*/
_DEA_DSP_LEVEL2_5MENU_1, /* 182 是否结束经销商模式*/
_MN_DSP_MENU_MAX,
......@@ -844,6 +858,30 @@ 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 LevelF4_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_1Exit(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_2Enter(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_2Do(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_2Exit(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_3Enter(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_3Do(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_3Exit(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_4Enter(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_4Do(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_4Exit(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_5Enter(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_5Do(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_5Exit(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_6Enter(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_6Do(void);
EXTERN_MEU_PROCESS void LevelF4_2Menu_6Exit(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Enter(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Do(void);
EXTERN_MEU_PROCESS void LevelF2_5Menu_1Exit(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 97efa416
......@@ -189,12 +189,20 @@ const _MenuOptTab MenuOptTab[] =
/*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},
/*28*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_1Enter, LevelF3_2Menu_1Do, LevelF3_2Menu_1Exit},
/*29*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_2Enter, LevelF3_2Menu_2Do, LevelF3_2Menu_2Exit},
/*30*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_3Enter, LevelF3_2Menu_3Do, LevelF3_2Menu_3Exit},
/*31*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_4Enter, LevelF3_2Menu_4Do, LevelF3_2Menu_4Exit},
/*32*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_5Enter, LevelF3_2Menu_5Do, LevelF3_2Menu_5Exit},
/*33*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF3_2Menu_6Enter, LevelF3_2Menu_6Do, LevelF3_2Menu_6Exit},
/*34*/{ _FAC_DSP_LEVEL1_2MENU_1, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF4_2Menu_1Enter, LevelF4_2Menu_1Do, LevelF4_2Menu_1Exit},
/*35*/{ _FAC_DSP_LEVEL1_2MENU_2, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF4_2Menu_2Enter, LevelF4_2Menu_2Do, LevelF4_2Menu_2Exit},
/*36*/{ _FAC_DSP_LEVEL1_2MENU_3, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF4_2Menu_3Enter, LevelF4_2Menu_3Do, LevelF4_2Menu_3Exit},
/*37*/{ _FAC_DSP_LEVEL1_2MENU_4, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF4_2Menu_4Enter, LevelF4_2Menu_4Do, LevelF4_2Menu_4Exit},
/*38*/{ _FAC_DSP_LEVEL1_2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF4_2Menu_5Enter, LevelF4_2Menu_5Do, LevelF4_2Menu_5Exit},
/*39*/{ _FAC_DSP_LEVEL1_2MENU_6, _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, LevelF4_2Menu_6Enter, LevelF4_2Menu_6Do, LevelF4_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},
......@@ -2716,7 +2724,7 @@ void LevelF2_1Menu_6Do(void)
if (DTCNumDis == 1u) /*计时*/
{
GUI_BG_DTCIntarder_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_DTCRetarder_Display(GUI_DISP_MODE_NORMAL);
}
else /*故障码读取中*/
{
......@@ -2730,86 +2738,381 @@ void LevelF2_1Menu_6Exit(void)
void LevelF2_2Menu_1Enter(void)
{}
void LevelF2_2Menu_1Do(void)
{}
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearEngine_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_2Menu_1Exit(void)
{}
/*----工厂模式----清除刹车----*/
void LevelF2_2Menu_2Enter(void)
{}
void LevelF2_2Menu_2Do(void)
{}
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearBrake_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_2Menu_2Exit(void)
{}
/*----工厂模式----清除变速箱----*/
void LevelF2_2Menu_3Enter(void)
{}
void LevelF2_2Menu_3Do(void)
{}
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearAMT_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_2Menu_3Exit(void)
{}
/*----工厂模式----清除雷达----*/
void LevelF2_2Menu_4Enter(void)
{}
void LevelF2_2Menu_4Do(void)
{}
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearRadar_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_2Menu_4Exit(void)
{}
/*----工厂模式----清除摄像头---*/
void LevelF2_2Menu_5Enter(void)
{}
void LevelF2_2Menu_5Do(void)
{}
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearCamer_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_2Menu_5Exit(void)
{}
/*----工厂模式----清除缓速器----*/
void LevelF2_2Menu_6Enter(void)
{}
void LevelF2_2Menu_6Do(void)
{}
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClearRetarder_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF2_2Menu_6Exit(void)
{}
/*----工厂模式----清除发动机----*/
void LevelF3_2Menu_1Enter(void)
{}
{
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 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 LevelF3_2Menu_1Do(void)
{}
{
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClearEngine1_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL4_2MENU_1);
bCurMenuIDX = _FAC_DSP_LEVEL4_2MENU_1;
}
}
void LevelF3_2Menu_1Exit(void)
{}
/*----工厂模式----清除刹车----*/
void LevelF3_2Menu_2Enter(void)
{}
{
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 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 LevelF3_2Menu_2Do(void)
{}
{
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClearBrake1_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL4_2MENU_2);
bCurMenuIDX = _FAC_DSP_LEVEL4_2MENU_2;
}
}
void LevelF3_2Menu_2Exit(void)
{}
/*----工厂模式----清除变速箱----*/
void LevelF3_2Menu_3Enter(void)
{}
{
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 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 LevelF3_2Menu_3Do(void)
{}
{
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClearAMT1_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL4_2MENU_3);
bCurMenuIDX = _FAC_DSP_LEVEL4_2MENU_3;
}
}
void LevelF3_2Menu_3Exit(void)
{}
/*----工厂模式----清除雷达----*/
void LevelF3_2Menu_4Enter(void)
{}
{
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 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 LevelF3_2Menu_4Do(void)
{}
{
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClearRadar1_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL4_2MENU_4);
bCurMenuIDX = _FAC_DSP_LEVEL4_2MENU_4;
}
}
void LevelF3_2Menu_4Exit(void)
{}
/*----工厂模式----清除摄像头----*/
void LevelF3_2Menu_5Enter(void)
{}
{
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 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 LevelF3_2Menu_5Do(void)
{}
{
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClearCamer1_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL4_2MENU_5);
bCurMenuIDX = _FAC_DSP_LEVEL4_2MENU_5;
}
}
void LevelF3_2Menu_5Exit(void)
{}
/*----工厂模式----清除缓速器----*/
void LevelF3_2Menu_6Enter(void)
{}
{
_CAN_Msg canMag;
canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u;
canMag.MsgPro = 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 LevelF3_2Menu_6Do(void)
{}
{
GUI_OftenShow_Display();
if (Common_Get_Menu_FacDea_Time_Sta() < 1500u)
{
GUI_BG_FacDTCClearRetarder1_Display(GUI_DISP_MODE_NORMAL);
}
else
{
Common_Set_Menu_FacDea_Time_Sta(0u);
NextMenu(_FAC_DSP_LEVEL4_2MENU_6);
bCurMenuIDX = _FAC_DSP_LEVEL4_2MENU_6;
}
}
void LevelF3_2Menu_6Exit(void)
{}
/*----工厂模式----清除发动机成功----*/
void LevelF4_2Menu_1Enter(void)
{}
void LevelF4_2Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF4_2Menu_1Exit(void)
{}
void LevelF4_2Menu_2Enter(void)
{}
void LevelF4_2Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF4_2Menu_2Exit(void)
{}
void LevelF4_2Menu_3Enter(void)
{}
void LevelF4_2Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF4_2Menu_3Exit(void)
{}
void LevelF4_2Menu_4Enter(void)
{}
void LevelF4_2Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF4_2Menu_4Exit(void)
{}
void LevelF4_2Menu_5Enter(void)
{}
void LevelF4_2Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF4_2Menu_5Exit(void)
{}
void LevelF4_2Menu_6Enter(void)
{}
void LevelF4_2Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_FacDTCClear4_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF4_2Menu_6Exit(void)
{}
/*----工厂模式----是否结束工厂模式-----*/
void LevelF2_5Menu_1Enter(void)
{}
......
source/Application/RTE/Common_Interface.c
View file @ 97efa416
......@@ -394,7 +394,11 @@ void Common_Input_Para(void)
}
/**/
if ((bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_3) || (bCurMenuIDX == _DEA_DSP_LEVEL1_2MENU_3) || (MenuFlag.Menu_StaFlag != 0x01u))
if (
((bCurMenuIDX >= _FAC_DSP_LEVEL3_2MENU_1) && (bCurMenuIDX <= _FAC_DSP_LEVEL3_2MENU_6)) ||
((bCurMenuIDX >= _DEA_DSP_LEVEL3_2MENU_1) && (bCurMenuIDX <= _DEA_DSP_LEVEL3_2MENU_6)) ||
(MenuFlag.Menu_StaFlag != 0x01u)
)
{
if (Menu_FacDea_Time < 15000u)
{
......
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