Skip to content

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

调整菜单结构,编译通过

parent 2fb8b813
Expand all Show whitespace changes
Inline Side-by-side
Showing with 23543 additions and 22910 deletions
ghs/project
View file @ 6e6d9849
No preview for this file type
ghs/project.hex
View file @ 6e6d9849
This diff is collapsed.
ghs/project.siz
View file @ 6e6d9849
project .intvect 1536 project .intvect 1536
project .text 299468 project .text 299820
project .rodata 409343 project .rodata 409999
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
project .romdata 9037 project .romdata 9037
......
source/Application/APP/Key/Key_user.c
View file @ 6e6d9849
...@@ -217,28 +217,21 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -217,28 +217,21 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU)) if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU))
{ {
if ( if (
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3 ) || /*显示设置*/ ( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3 ) || /*语言设定*/
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_7 ) || /*语言设定*/ ((bCurMenuIDX >= _MN_DSP_LEVEL4_4_MENU_1 ) && (bCurMenuIDX <= _MN_DSP_LEVEL4_4_MENU_7)) /*省油设定子菜单*/
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_9 ) || /*单位设定*/
( bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_8 ) || /*亮度调节*/
( bCurMenuIDX == _MN_DSP_LEVEL4_1_MENU_1 ) || /*日期设置退出*/
( bCurMenuIDX == _MN_DSP_LEVEL4_1_MENU_2 ) || /*日期格式设置退出*/
( bCurMenuIDX == _MN_DSP_LEVEL4_2_MENU_1 ) || /*时间设置退出*/
( bCurMenuIDX == _MN_DSP_LEVEL4_2_MENU_2 ) || /*时间格式退出*/
((bCurMenuIDX >= _MN_DSP_LEVEL4_4_MENU_1 ) && (bCurMenuIDX <= _MN_DSP_LEVEL4_4_MENU_5)) /*省油设定子菜单*/
) )
{ {
MenuFlag.Menu_Return = 0; MenuFlag.Menu_Return = 0;
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A ) /*胎压设置界面返回操作*/ //else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A ) /*胎压设置界面返回操作*/
{
//if (User_set_Num.User_TpmsStatus != 2) /*不是正在匹配状态*/
//{ //{
// if (User_set_Num.User_TpmsStatus != 2) /*不是正在匹配状态*/
// {
// NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); // NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
//} // }
//else // else
//{ // {
// User_set_Num.User_TpmsStatus = 1; /*退出匹配界面*/ // User_set_Num.User_TpmsStatus = 1; /*退出匹配界面*/
// if (User_set_Num.User_Temp_Return == 0) // if (User_set_Num.User_Temp_Return == 0)
// { // {
...@@ -249,8 +242,8 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -249,8 +242,8 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
// { // {
// ; /* do nonthing*/ // ; /* do nonthing*/
// } // }
// }
//} //}
}
else else
{ {
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT); NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
...@@ -314,11 +307,11 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent) ...@@ -314,11 +307,11 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
/*无论从哪里都能回去*/ /*无论从哪里都能回去*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU)) else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU))
{ {
if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/ //if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
{ //{
NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/ // NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/
} //}
else //else
{ {
NextMenu(MenuFlag.Menu_Flag); NextMenu(MenuFlag.Menu_Flag);
} }
......
source/Application/Graphic/GUI/GUI.c
View file @ 6e6d9849
...@@ -103,11 +103,16 @@ void GUI_Display_Value_Init(void) ...@@ -103,11 +103,16 @@ void GUI_Display_Value_Init(void)
State_Flag.USER_PROPOSAL = 2u; State_Flag.USER_PROPOSAL = 2u;
State_Flag.USER_HSA = 1u; State_Flag.USER_HSA = 1u;
State_Flag.USER_VOLUEM = 1u; State_Flag.USER_VOLUEM = 1u;
State_Flag.USER_LANGUAGE = 1u; State_Flag.USER_LANGUAGE = 2u;
State_Flag.USER_COMPANY = 2u; State_Flag.USER_COMPANY = 2u;
State_Flag.USER_LIGHT = 2u; State_Flag.USER_LIGHT = 2u;
State_Flag.USER_SETIC = 2u; State_Flag.USER_SETIC = 2u;
State_Flag.FState_TPMSSET = 2u; State_Flag.FState_TPMSSET = 2u;
State_Flag.DEMO_LDWS = 2u;
State_Flag.DEMO_AEBS1 = 2u;
State_Flag.DEMO_AEBS2 = 2u;
State_Flag.DEMO_AEBS3 = 2u;
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function Name : GUI_Display_OftenShow_Group * Function Name : GUI_Display_OftenShow_Group
...@@ -2091,31 +2096,19 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode) ...@@ -2091,31 +2096,19 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
} }
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3) if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + State_Flag.USER_DISPLAY), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_4) if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_4)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
} }
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_5) else
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + State_Flag.USER_DISPLAY), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_6)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + State_Flag.USER_DISPLAY), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_11black + State_Flag.USER_SETIC), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
} }
else else
{ {
...@@ -2176,7 +2169,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode) ...@@ -2176,7 +2169,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
uint8_t Flag = 0; uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -2264,3 +2257,154 @@ void GUI_BG_UserSetMenu7_Display(uint8_t Mode) ...@@ -2264,3 +2257,154 @@ void GUI_BG_UserSetMenu7_Display(uint8_t Mode)
} }
} }
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_Demo_Menu_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_Demo_Menu_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_User_Menu2_05_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 != _MN_DSP_LEVEL2_5_MENU_1)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_1black + State_Flag.DEMO_LDWS), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_2)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_2black + State_Flag.DEMO_AEBS1), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_3)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_3black + State_Flag.DEMO_AEBS2), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_5_MENU_4)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_4black + State_Flag.DEMO_AEBS3), 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_DemoMenu1_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu1_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_1black + 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_DemoMenu2_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu2_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_2black + 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_DemoMenu3_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu3_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_3black + 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_DemoMenu4_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DemoMenu4_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_05_4black + 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_Errot_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_Errot_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
GUI_General_Display(MENU_Sprite, CN_User_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); /*长度条*/
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ 6e6d9849
...@@ -5,51 +5,57 @@ ...@@ -5,51 +5,57 @@
#include "loc_graphics.h" #include "loc_graphics.h"
#include "images.h" #include "images.h"
#include "TYW_stdint.h" #include "TYW_stdint.h"
typedef struct typedef struct
{ {
uint8_t FState_GZM ; /*故障码*/ uint8_t FState_GZM; /*故障码*/
uint8_t FState_WXTZ ; /*维修提醒*/ uint8_t FState_WXTZ; /*维修提醒*/
uint8_t FState_WXSD ; /*维修设定*/ uint8_t FState_WXSD; /*维修设定*/
uint8_t FState_YHSD ; /*用户设定*/ uint8_t FState_YHSD; /*用户设定*/
uint8_t FState_ECO ; /*ECO*/ uint8_t FState_ECO; /*ECO*/
uint8_t FState_TPMS ; /*胎压显示*/ uint8_t FState_TPMS; /*胎压显示*/
uint8_t FState_SYSYS ; /*系统演示*/ uint8_t FState_SYSYS; /*系统演示*/
uint8_t WXTZ_FDJY ; /*发动机油*/ uint8_t WXTZ_FDJY; /*发动机油*/
uint8_t WXTZ_RYLQY ; /*燃油滤清油*/ uint8_t WXTZ_RYLQY; /*燃油滤清油*/
uint8_t WXTZ_BSXY ; /*变速箱油*/ uint8_t WXTZ_BSXY; /*变速箱油*/
uint8_t WXTZ_CSQY ; /*差速器油*/ uint8_t WXTZ_CSQY; /*差速器油*/
uint8_t WXTZ_LHQY ; /*离合器油*/ uint8_t WXTZ_LHQY; /*离合器油*/
uint8_t WXTZ_KQGZJ ; /*空气干燥剂*/ uint8_t WXTZ_KQGZJ; /*空气干燥剂*/
uint8_t WXTZ_DLZXY ; /*动力转向油*/ uint8_t WXTZ_DLZXY; /*动力转向油*/
uint8_t WXTZ_LT ; /*轮胎*/ uint8_t WXTZ_LT; /*轮胎*/
uint8_t WXTZ_QDJ ; /*起动机*/ uint8_t WXTZ_QDJ; /*起动机*/
uint8_t WXSD_FDJY ; /*发动机*/ uint8_t WXSD_FDJY; /*发动机*/
uint8_t WXSD_RYLQY ; /*燃油滤清油*/ uint8_t WXSD_RYLQY; /*燃油滤清油*/
uint8_t WXSD_BSXY ; /*变速箱油*/ uint8_t WXSD_BSXY; /*变速箱油*/
uint8_t WXSD_CSQY ; /*差速器油*/ uint8_t WXSD_CSQY; /*差速器油*/
uint8_t WXSD_LHQY ; /*离合器油*/ uint8_t WXSD_LHQY; /*离合器油*/
uint8_t WXSD_KQGZJ ; /*空气转向*/ uint8_t WXSD_KQGZJ; /*空气转向*/
uint8_t WXSD_DLZXY ; /*动力转向*/ uint8_t WXSD_DLZXY; /*动力转向*/
uint8_t WXSD_LT ; /*轮胎*/ uint8_t WXSD_LT; /*轮胎*/
uint8_t WXSD_QDJ ; /*起动机*/ uint8_t WXSD_QDJ; /*起动机*/
uint8_t USER_DATE ; /*日期设定*/ uint8_t USER_DATE; /*日期设定*/
uint8_t USER_TIME ; /*时间设定*/ uint8_t USER_TIME; /*时间设定*/
uint8_t USER_DISPLAY ; /*显示设定*/ uint8_t USER_DISPLAY; /*显示设定*/
uint8_t USER_PROPOSAL ; /*省油设定*/ uint8_t USER_PROPOSAL; /*省油设定*/
uint8_t USER_HSA ; /*HAS*/ uint8_t USER_HSA; /*HAS*/
uint8_t USER_VOLUEM ; /*音量设定*/ uint8_t USER_VOLUEM; /*音量设定*/
uint8_t USER_LANGUAGE ; /*语言设定*/ uint8_t USER_LANGUAGE; /*语言设定*/
uint8_t USER_COMPANY ; /*单位设定*/ uint8_t USER_COMPANY; /*单位设定*/
uint8_t USER_LIGHT ; /*亮度设定*/ uint8_t USER_LIGHT; /*亮度设定*/
uint8_t USER_SETIC ; /*仪表设定*/ uint8_t USER_SETIC; /*仪表设定*/
uint8_t DEMO_LDWS;
uint8_t FState_TPMSSET ; /*胎压设置*/ uint8_t DEMO_AEBS1;
uint8_t DEMO_AEBS2;
uint8_t DEMO_AEBS3;
uint8_t FState_TPMSSET; /*胎压设置*/
uint8_t ENTER_RETURN ;
} _Display_State_Flag; } _Display_State_Flag;
extern volatile _Display_State_Flag State_Flag; extern volatile _Display_State_Flag State_Flag;
static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri}; static const uint32_t GUIWedk[7u] = {CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu, CN_xingqiri};
static const uint32_t GUIGear[12u] = {CN_dangwei_01, CN_dangwei_02, CN_dangwei_03, CN_dangwei_04, CN_dangwei_05, CN_dangwei_06, static const uint32_t GUIGear[12u] = {CN_dangwei_01, CN_dangwei_02, CN_dangwei_03, CN_dangwei_04, CN_dangwei_05, CN_dangwei_06,
CN_dangwei_07, CN_dangwei_08, CN_dangwei_09, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12 CN_dangwei_07, CN_dangwei_08, CN_dangwei_09, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12
...@@ -75,7 +81,6 @@ static const uint16_t GUI_DISP_MENUYear1[4] = {568u, 552u, 538u, 522u}; ...@@ -75,7 +81,6 @@ static const uint16_t GUI_DISP_MENUYear1[4] = {568u, 552u, 538u, 522u};
static const uint16_t GUI_DISP_MENUMonth1[2] = {617u, 604u}; static const uint16_t GUI_DISP_MENUMonth1[2] = {617u, 604u};
static const uint16_t GUI_DISP_MENUDate1[2] = {669u, 653u}; static const uint16_t GUI_DISP_MENUDate1[2] = {669u, 653u};
static const uint16_t GUI_DISP_MENU_Y[4] = {150u, 198u, 246u, 294u}; static const uint16_t GUI_DISP_MENU_Y[4] = {150u, 198u, 246u, 294u};
extern void GUI_Display_KL15_ON_Init(void); extern void GUI_Display_KL15_ON_Init(void);
...@@ -107,41 +112,45 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转 ...@@ -107,41 +112,45 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转
void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/ void GUI_Year_Month_Data_Display(uint8_t Mode); /*年月日*/
void GUI_block_NULL_Display(uint8_t Mode); /*……*/ void GUI_block_NULL_Display(uint8_t Mode); /*……*/
void GUI_BG_Menu_Display(uint8_t Mode); /*一级菜单项*/ void GUI_BG_Menu_Display(uint8_t Mode); /*一级菜单项*/
void GUI_BG_Menu1_Display(uint8_t Mode); void GUI_BG_Menu1_Display(uint8_t Mode); /**/
void GUI_BG_Menu2_Display(uint8_t Mode); void GUI_BG_Menu2_Display(uint8_t Mode); /**/
void GUI_BG_Menu3_Display(uint8_t Mode); void GUI_BG_Menu3_Display(uint8_t Mode); /**/
void GUI_BG_Menu4_Display(uint8_t Mode); void GUI_BG_Menu4_Display(uint8_t Mode); /**/
void GUI_BG_Menu5_Display(uint8_t Mode); void GUI_BG_Menu5_Display(uint8_t Mode); /**/
void GUI_BG_Menu6_Display(uint8_t Mode); void GUI_BG_Menu6_Display(uint8_t Mode); /**/
void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单项保养通知*/ void GUI_BG_Errot_Display(uint8_t Mode); /*二级菜单--故障码显示*/
void GUI_BG_RepMenu1_Display(uint8_t Mode); void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单--保养通知*/
void GUI_BG_RepMenu2_Display(uint8_t Mode); void GUI_BG_RepMenu1_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu3_Display(uint8_t Mode); void GUI_BG_RepMenu2_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu4_Display(uint8_t Mode); void GUI_BG_RepMenu3_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu5_Display(uint8_t Mode); void GUI_BG_RepMenu4_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu6_Display(uint8_t Mode); void GUI_BG_RepMenu5_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu7_Display(uint8_t Mode); void GUI_BG_RepMenu6_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu8_Display(uint8_t Mode); void GUI_BG_RepMenu7_Display(uint8_t Mode); /**/
void GUI_BG_RepMenu9_Display(uint8_t Mode); void GUI_BG_RepMenu8_Display(uint8_t Mode); /**/
void GUI_BG_RepSet_Menu_Display(uint8_t Mode); /*二级菜单保养通知设定*/ void GUI_BG_RepMenu9_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu1_Display(uint8_t Mode); void GUI_BG_RepSet_Menu_Display(uint8_t Mode); /*二级菜单--保养通知设定*/
void GUI_BG_RepSetMenu2_Display(uint8_t Mode); void GUI_BG_RepSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu3_Display(uint8_t Mode); void GUI_BG_RepSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu4_Display(uint8_t Mode); void GUI_BG_RepSetMenu3_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu5_Display(uint8_t Mode); void GUI_BG_RepSetMenu4_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu6_Display(uint8_t Mode); void GUI_BG_RepSetMenu5_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu7_Display(uint8_t Mode); void GUI_BG_RepSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu8_Display(uint8_t Mode); void GUI_BG_RepSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_Menu_Display(uint8_t Mode); /*二级菜单用户设定*/ void GUI_BG_RepSetMenu8_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu1_Display(uint8_t Mode); void GUI_BG_UserSet_Menu_Display(uint8_t Mode); /*二级菜单--用户设定*/
void GUI_BG_UserSetMenu2_Display(uint8_t Mode); void GUI_BG_UserSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu3_Display(uint8_t Mode); void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu4_Display(uint8_t Mode); void GUI_BG_UserSetMenu3_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu5_Display(uint8_t Mode); void GUI_BG_UserSetMenu4_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu6_Display(uint8_t Mode); void GUI_BG_UserSetMenu5_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu7_Display(uint8_t Mode); void GUI_BG_UserSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_Demo_Menu_Display(uint8_t Mode); /*二级菜单--系统演示模式*/
void GUI_BG_DemoMenu1_Display(uint8_t Mode);
void GUI_BG_DemoMenu2_Display(uint8_t Mode);
void GUI_BG_DemoMenu3_Display(uint8_t Mode);
void GUI_BG_DemoMenu4_Display(uint8_t Mode);
......
source/Application/Graphic/Menu/Menu.h
View file @ 6e6d9849
This diff is collapsed.
source/Application/Graphic/Menu/Menu_user.c
View file @ 6e6d9849
This diff is collapsed.
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