Skip to content

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

增加DTC清除界面

parent fa07b866
Show whitespace changes
Inline Side-by-side
Showing with 268 additions and 13 deletions
source/Application/Graphic/GUI/GUI.c
View file @ 5caaf748
......@@ -7038,7 +7038,7 @@ void GUI_BG_FacDTCMenu_Display(uint8_t Mode)
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu_Display
* Function Name : GUI_BG_FacDTCMenu1_Display
* Description :
* Input : None
* Output : None
......@@ -7058,6 +7058,15 @@ void GUI_BG_FacDTCMenu1_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7071,6 +7080,15 @@ void GUI_BG_FacDTCMenu2_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7084,6 +7102,15 @@ void GUI_BG_FacDTCMenu3_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7097,6 +7124,15 @@ void GUI_BG_FacDTCMenu4_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu5_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu5_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7110,6 +7146,15 @@ void GUI_BG_FacDTCMenu5_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCMenu6_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCMenu6_Display(uint8_t Mode)
{
uint8_t Flag = 0;
......@@ -7123,6 +7168,193 @@ void GUI_BG_FacDTCMenu6_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClear_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClear_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_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_2MENU_4)
{
if (bCurMenuIDX != _FAC_DSP_LEVEL1_2MENU_1)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_07white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1_2MENU_2)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_08white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1_2MENU_3)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_09white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _FAC_DSP_LEVEL1_2MENU_4)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_10white, 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else if (bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_5)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_08white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_09white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_10white, 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else if (bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_6)
{
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_09white, 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_10white, 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu1_11white, 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_FacDTCClearA_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearA_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_07black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearB_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearB_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_08black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacDTCClearC_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearC_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_09black + Flag), 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_FacDTCClearD_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearD_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_10black + 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_BG_FacDTCClearE_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearE_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_11black + 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_BG_FacDTCClearF_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_FacDTCClearF_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_12black + 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
* Description :
......
source/Application/Graphic/GUI/GUI.h
View file @ 5caaf748
......@@ -463,6 +463,13 @@ 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_FacDTCClear_Display(uint8_t Mode); /*工厂模式DTC清除*/
void GUI_BG_FacDTCClearA_Display(uint8_t Mode); /**/
void GUI_BG_FacDTCClearB_Display(uint8_t Mode); /**/
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_FacDTCClear1_Display(uint8_t Mode); /*工厂模式清除DTC1*/
void GUI_BG_FacDTCClear2_Display(uint8_t Mode); /*工厂模式清除DTC2*/
void GUI_BG_FacDTCClear3_Display(uint8_t Mode); /*工厂模式清除DTC2*/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 5caaf748
......@@ -159,12 +159,12 @@ const _MenuOptTab MenuOptTab[] =
/*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},
/*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},
/*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},
/*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},
/*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},
/*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},
/*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},
/*06*/{ _FAC_DSP_LEVEL2_2MENU_1, _MN_IDX_NULL, _FAC_DSP_LEVEL1_2MENU_2, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_1Enter, LevelF1_2Menu_1Do, LevelF1_2Menu_1Exit},
/*07*/{ _FAC_DSP_LEVEL2_2MENU_2, _FAC_DSP_LEVEL1_2MENU_1, _FAC_DSP_LEVEL1_2MENU_3, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_2Enter, LevelF1_2Menu_2Do, LevelF1_2Menu_2Exit},
/*08*/{ _FAC_DSP_LEVEL2_2MENU_3, _FAC_DSP_LEVEL1_2MENU_2, _FAC_DSP_LEVEL1_2MENU_4, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_3Enter, LevelF1_2Menu_3Do, LevelF1_2Menu_3Exit},
/*09*/{ _FAC_DSP_LEVEL2_2MENU_4, _FAC_DSP_LEVEL1_2MENU_3, _FAC_DSP_LEVEL1_2MENU_5, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_4Enter, LevelF1_2Menu_4Do, LevelF1_2Menu_4Exit},
/*10*/{ _FAC_DSP_LEVEL2_2MENU_5, _FAC_DSP_LEVEL1_2MENU_4, _FAC_DSP_LEVEL1_2MENU_6, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_5Enter, LevelF1_2Menu_5Do, LevelF1_2Menu_5Exit},
/*11*/{ _FAC_DSP_LEVEL2_2MENU_6, _FAC_DSP_LEVEL1_2MENU_5, _MN_IDX_NULL, _FAC_DSP_LEVEL1MENU_2, LevelF1_2Menu_6Enter, LevelF1_2Menu_6Do, LevelF1_2Menu_6Exit},
/*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},
/*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},
......@@ -2200,7 +2200,8 @@ void LevelF1_2Menu_1Enter(void)
void LevelF1_2Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_DTCSCR_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClearA_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_1Exit(void)
{}
......@@ -2208,35 +2209,50 @@ void LevelF1_2Menu_1Exit(void)
void LevelF1_2Menu_2Enter(void)
{}
void LevelF1_2Menu_2Do(void)
{}
{
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClearB_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_2Exit(void)
{}
void LevelF1_2Menu_3Enter(void)
{}
void LevelF1_2Menu_3Do(void)
{}
{
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClearC_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_3Exit(void)
{}
void LevelF1_2Menu_4Enter(void)
{}
void LevelF1_2Menu_4Do(void)
{}
{
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClearD_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_4Exit(void)
{}
void LevelF1_2Menu_5Enter(void)
{}
void LevelF1_2Menu_5Do(void)
{}
{
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClearE_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_5Exit(void)
{}
void LevelF1_2Menu_6Enter(void)
{}
void LevelF1_2Menu_6Do(void)
{}
{
GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_FacDTCClearF_Display(GUI_DISP_MODE_NORMAL);
}
void LevelF1_2Menu_6Exit(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