Skip to content

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

增加界面

parent 6e6d9849
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22906 additions and 22743 deletions
ghs/project
View file @ fbb7d3a3
No preview for this file type
ghs/project.hex
View file @ fbb7d3a3
This diff is collapsed.
ghs/project.siz
View file @ fbb7d3a3
project .intvect 1536
project .text 299820
project .rodata 409999
project .text 301628
project .rodata 409991
project .secinfo 120
project .syscall 6
project .romdata 9037
......
source/Application/APP/Key/Key_user.c
View file @ fbb7d3a3
......@@ -55,25 +55,13 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*主界面*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
/*一级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2MENU_6))
/*主界面 一级菜单 二级菜单那*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2))
{
/*故障码*/
if ((CanStatus1 == CAN_SIG_LOST) && (bCurMenuIDX == _MN_DSP_LEVEL2MENU_2))
NextMenu(_MN_DSP_LEVEL2MENU_1);
else
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
/*二级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
{
if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1 ) /*胎压显示*/
{
Common_Set_TPMS_Kpa_Temp_Flag(1u);
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
else
{
......@@ -81,6 +69,9 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
}
}
}
}
else
......@@ -108,28 +99,12 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*主界面*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
/*一级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2MENU_6))
/*主界面 一级菜单 二级菜单*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
/*二级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
{
if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1)
{
Common_Set_TPMS_Kpa_Temp_Flag(0u);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
}
......@@ -162,7 +137,7 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*一级菜单--二级菜单*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
......
source/Application/Graphic/GUI/GUI.c
View file @ fbb7d3a3
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ fbb7d3a3
......@@ -80,8 +80,17 @@ static const uint16_t GUI_DISP_MENUDate[2] = {648u, 630u};
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_MENUDate1[2] = {669u, 653u};
static const uint16_t GUI_DISP_MENU_Y[4] = {150u, 198u, 246u, 294u}; /*菜单选项纵坐标*/
static const uint16_t GUI_TPMS_PIC_X[4] = {298u, 373u, 478u, 543u};
static const uint16_t GUI_TPMS_PIC_Y[4] = {115u, 140u, 214u, 238u};
static const uint16_t GUI_TPMS_NUM1_X[3] = {344u, 329u, 314u};
static const uint16_t GUI_TPMS_NUM2_X[3] = {419u, 404u, 389u};
static const uint16_t GUI_TPMS_NUM3_X[3] = {525u, 510u, 495u};
static const uint16_t GUI_TPMS_NUM4_X[3] = {589u, 574u, 559u};
static const uint16_t GUI_TPMS_NUM_Y[4] = {109u, 173u, 210u, 274u};
static const uint16_t GUI_TPMS_MIC3_X[4] = {314u, 389u, 495u, 559u};
static const uint16_t GUI_TPMS_MIC2_X[4] = {329u, 404u, 510u, 574u};
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_OFF_Init(void);
......@@ -151,7 +160,10 @@ 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);
void GUI_BG_TPMS_GasPIC_Display(uint8_t Mode); /*二级菜单--TPMS*/
void GUI_BG_TPMS_GasNUM_Display(uint8_t Mode);
void GUI_BG_TPMS_TempPIC_Display(uint8_t Mode);
void GUI_BG_TPMS_TempNUM_Display(uint8_t Mode);
void GUI_BG_RepMenuRepSet_Display(uint8_t Mode); /*三级菜单--保养通知*/
#endif
\ No newline at end of file
source/Application/Graphic/Menu/Menu.h
View file @ fbb7d3a3
......@@ -42,8 +42,7 @@ typedef enum
_MN_DSP_LEVEL2_2_MENU_6, /* 19 空气干燥器干燥剂*/
_MN_DSP_LEVEL2_2_MENU_7, /* 20 动力转向液*/
_MN_DSP_LEVEL2_2_MENU_8, /* 21 轮胎*/
_MN_DSP_LEVEL2_2_MENU_9, /* 22 起动机*/
_MN_DSP_LEVEL2_3_MENU_1, /* 23 更换机油＆机油滤清器*/
_MN_DSP_LEVEL2_3_MENU_2, /* 24 更换燃油滤清器*/
_MN_DSP_LEVEL2_3_MENU_3, /* 25 更换变速箱油*/
......@@ -51,7 +50,6 @@ typedef enum
_MN_DSP_LEVEL2_3_MENU_5, /* 27 离合器油*/
_MN_DSP_LEVEL2_3_MENU_6, /* 28 更换动力转向液*/
_MN_DSP_LEVEL2_3_MENU_7, /* 29 轮胎换位・更换*/
_MN_DSP_LEVEL2_3_MENU_8, /* 30 更换起动机*/
_MN_DSP_LEVEL2_4_MENU_1, /* 31 设定日期*/
_MN_DSP_LEVEL2_4_MENU_2, /* 32 设定时间*/
......@@ -75,7 +73,6 @@ typedef enum
_MN_DSP_LEVEL3_2_MENU_6, /* 46 空气干燥器干燥剂*/
_MN_DSP_LEVEL3_2_MENU_7, /* 47 动力转向液*/
_MN_DSP_LEVEL3_2_MENU_8, /* 48 轮胎*/
_MN_DSP_LEVEL3_2_MENU_9, /* 49 起动机*/
_MN_DSP_LEVEL3_3_MENU_1, /* 50 更换机油＆机油滤清器*/
_MN_DSP_LEVEL3_3_MENU_2, /* 51 更换燃油滤清器*/
......@@ -84,7 +81,6 @@ typedef enum
_MN_DSP_LEVEL3_3_MENU_5, /* 54 SMOOTHER离合器油*/
_MN_DSP_LEVEL3_3_MENU_6, /* 55 更换动力转向液*/
_MN_DSP_LEVEL3_3_MENU_7, /* 56 轮胎换位・更换*/
_MN_DSP_LEVEL3_3_MENU_8, /* 57 更换起动机*/
_MN_DSP_LEVEL3_4_MENU_1, /* 58 设定日期*/
_MN_DSP_LEVEL3_4_MENU_2, /* 59 设定时间*/
......@@ -246,10 +242,6 @@ EXTERN_MEU_PROCESS void Level2_2Menu_8Enter(void);
EXTERN_MEU_PROCESS void Level2_2Menu_8Do(void);
EXTERN_MEU_PROCESS void Level2_2Menu_8Exit(void);
EXTERN_MEU_PROCESS void Level2_2Menu_9Enter(void);
EXTERN_MEU_PROCESS void Level2_2Menu_9Do(void);
EXTERN_MEU_PROCESS void Level2_2Menu_9Exit(void);
EXTERN_MEU_PROCESS void Level2_3Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level2_3Menu_1Do(void);
EXTERN_MEU_PROCESS void Level2_3Menu_1Exit(void);
......@@ -278,10 +270,6 @@ EXTERN_MEU_PROCESS void Level2_3Menu_7Enter(void);
EXTERN_MEU_PROCESS void Level2_3Menu_7Do(void);
EXTERN_MEU_PROCESS void Level2_3Menu_7Exit(void);
EXTERN_MEU_PROCESS void Level2_3Menu_8Enter(void);
EXTERN_MEU_PROCESS void Level2_3Menu_8Do(void);
EXTERN_MEU_PROCESS void Level2_3Menu_8Exit(void);
EXTERN_MEU_PROCESS void Level2_4Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level2_4Menu_1Do(void);
EXTERN_MEU_PROCESS void Level2_4Menu_1Exit(void);
......@@ -358,10 +346,6 @@ EXTERN_MEU_PROCESS void Level3_2Menu_8Enter(void);
EXTERN_MEU_PROCESS void Level3_2Menu_8Do(void);
EXTERN_MEU_PROCESS void Level3_2Menu_8Exit(void);
EXTERN_MEU_PROCESS void Level3_2Menu_9Enter(void);
EXTERN_MEU_PROCESS void Level3_2Menu_9Do(void);
EXTERN_MEU_PROCESS void Level3_2Menu_9Exit(void);
EXTERN_MEU_PROCESS void Level3_3Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_1Do(void);
EXTERN_MEU_PROCESS void Level3_3Menu_1Exit(void);
......@@ -390,10 +374,6 @@ EXTERN_MEU_PROCESS void Level3_3Menu_7Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_7Do(void);
EXTERN_MEU_PROCESS void Level3_3Menu_7Exit(void);
EXTERN_MEU_PROCESS void Level3_3Menu_8Enter(void);
EXTERN_MEU_PROCESS void Level3_3Menu_8Do(void);
EXTERN_MEU_PROCESS void Level3_3Menu_8Exit(void);
EXTERN_MEU_PROCESS void Level3_4Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level3_4Menu_1Do(void);
EXTERN_MEU_PROCESS void Level3_4Menu_1Exit(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ fbb7d3a3
This diff is collapsed.
source/Driver/Graphic/loc_graphics_data.h
View file @ fbb7d3a3
......@@ -109,7 +109,7 @@ uint8_t CalendarEn = 0u;
LogicLayerAttr_t CalendarLogicLayerAttr[MAX_CALENDAR_SUP_LAYER];
/**/
#define MAX_MENU_SUP_LAYER 20
#define MAX_MENU_SUP_LAYER 57
MultiBufferSprite_t MENUSpriteBuf;
uint8_t MENUIndex = 0u;
uint8_t MENUUpdate = 0u;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment