Skip to content

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

增加界面

parent d919e2f2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22338 additions and 22375 deletions
ghs/project
View file @ 2fb8b813
No preview for this file type
ghs/project.hex
View file @ 2fb8b813
This diff is collapsed.
ghs/project.siz
View file @ 2fb8b813
project .intvect 1536
project .text 299244
project .text 299468
project .rodata 409343
project .secinfo 120
project .syscall 6
......
source/Application/APP/Key/Key_user.c
View file @ 2fb8b813
......@@ -71,11 +71,7 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
/*二级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
{
if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_8)
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_4);
}
else if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1 ) /*胎压显示*/
if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1 ) /*胎压显示*/
{
Common_Set_TPMS_Kpa_Temp_Flag(1u);
}
......@@ -84,6 +80,7 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
}
}
}
else
......@@ -124,15 +121,7 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
/*二级菜单*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2_1_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
{
if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_4)
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_8);
}
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_8)
{
NextMenu(_MN_IDX_NULL);
}
else if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1)
if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1)
{
Common_Set_TPMS_Kpa_Temp_Flag(0u);
}
......
source/Application/Graphic/GUI/GUI.c
View file @ 2fb8b813
......@@ -206,7 +206,7 @@ void GUI_Time_Dispaly(uint8_t Mode)
{
/*时*/
Time_Hours = Get_RTC_HOUR();
if (1) /*24小时*/
if (0u) /*12小时*/
{
if (Time_Hours == 0)
{
......@@ -1241,7 +1241,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
Month = Get_RTC_MONTH();
Date = Get_RTC_DATE();
/*年月日*/
if (1)
if (1u)
{
GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
......@@ -1278,7 +1278,7 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
Time_Hours = Get_RTC_HOUR();
/*时间*/
if (1)
if (0u)
{
if (Time_Hours < 12)
{
......@@ -2108,13 +2108,13 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
{
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_5black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[2u], 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_5black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_6black + State_Flag.USER_SETIC), 225u, GUI_DISP_MENU_Y[2u], 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
......@@ -2123,13 +2123,6 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSetMenu1_Display
* Description :
......@@ -2143,7 +2136,7 @@ void GUI_BG_UserSetMenu1_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_1black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -2163,7 +2156,7 @@ void GUI_BG_UserSetMenu2_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -2183,7 +2176,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_3black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -2203,7 +2196,7 @@ void GUI_BG_UserSetMenu4_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -2223,7 +2216,7 @@ void GUI_BG_UserSetMenu5_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -2243,7 +2236,7 @@ void GUI_BG_UserSetMenu6_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_11black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -2263,10 +2256,11 @@ void GUI_BG_UserSetMenu7_Display(uint8_t Mode)
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_03_08black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
\ No newline at end of file
}
source/Application/Graphic/Menu/Menu.h
View file @ 2fb8b813
......@@ -39,7 +39,6 @@ typedef enum
_MN_DSP_LEVEL2_2_MENU_2, /* 15 燃油滤清器*/
_MN_DSP_LEVEL2_2_MENU_3, /* 16 变速箱油*/
_MN_DSP_LEVEL2_2_MENU_4, /* 17 差速器油*/
_MN_DSP_LEVEL2_2_MENU_5, /* 18 离合油*/
_MN_DSP_LEVEL2_2_MENU_6, /* 19 空气干燥器干燥剂*/
_MN_DSP_LEVEL2_2_MENU_7, /* 20 动力转向液*/
_MN_DSP_LEVEL2_2_MENU_8, /* 21 轮胎*/
......@@ -56,83 +55,64 @@ typedef enum
_MN_DSP_LEVEL2_4_MENU_1, /* 31 设定日期*/
_MN_DSP_LEVEL2_4_MENU_2, /* 32 设定时间*/
_MN_DSP_LEVEL2_4_MENU_3, /* 33 设定显示*/
_MN_DSP_LEVEL2_4_MENU_3, /* 33 语言设定*/
_MN_DSP_LEVEL2_4_MENU_4, /* 34 设定节油驾驶建议*/
_MN_DSP_LEVEL2_4_MENU_5, /* 35 TPMS轮胎设定*/
_MN_DSP_LEVEL2_4_MENU_6, /* 36 仪表设定*/
_MN_DSP_LEVEL2_4_MENU_7, /* 37 语言设定*/
_MN_DSP_LEVEL2_4_MENU_8, /* 38 */
_MN_DSP_LEVEL2_4_MENU_9, /* 39 */
_MN_DSP_LEVEL2_5_MENU_1, /* */
_MN_DSP_LEVEL2_5_MENU_2, /* */
_MN_DSP_LEVEL2_5_MENU_3, /* */
_MN_DSP_LEVEL2_5_MENU_4, /* */
_MN_DSP_LEVEL2_5_MENU_1, /* 36 LDWS 警报演示*/
_MN_DSP_LEVEL2_5_MENU_2, /* 37 AEBS第1警报演示*/
_MN_DSP_LEVEL2_5_MENU_3, /* 38 AEBS第2警报演示*/
_MN_DSP_LEVEL2_5_MENU_4, /* 39 AEBS全力制动警报演示*/
_MN_DSP_LEVEL2_6_MENU_1, /* */
_MN_DSP_LEVEL2_6_MENU_2, /* */
_MN_DSP_LEVEL2_6_MENU_1, /* 40 轮胎气压*/
_MN_DSP_LEVEL2_6_MENU_2, /* 41 轮胎温度*/
/*三级菜单*/
//_MN_DSP_LEVEL3_1_MENU_1 , //42
//_MN_DSP_LEVEL3_1_MENU_2 , //43
//_MN_DSP_LEVEL3_1_MENU_3 , //44
//_MN_DSP_LEVEL3_1_MENU_4 , //45
//_MN_DSP_LEVEL3_1_MENU_5 ,
_MN_DSP_LEVEL3_2_MENU_1, // 39
_MN_DSP_LEVEL3_2_MENU_2, // 40
_MN_DSP_LEVEL3_2_MENU_3, // 41
_MN_DSP_LEVEL3_2_MENU_4, // 42
_MN_DSP_LEVEL3_2_MENU_5, //
_MN_DSP_LEVEL3_2_MENU_6, // 43
_MN_DSP_LEVEL3_2_MENU_7, // 44
_MN_DSP_LEVEL3_2_MENU_8, // 45
_MN_DSP_LEVEL3_2_MENU_9, // 46
_MN_DSP_LEVEL3_3_MENU_1, // 47
_MN_DSP_LEVEL3_3_MENU_2, // 48
_MN_DSP_LEVEL3_3_MENU_3, // 49
_MN_DSP_LEVEL3_3_MENU_4, // 50
_MN_DSP_LEVEL3_3_MENU_5, //
_MN_DSP_LEVEL3_3_MENU_6, // 51
_MN_DSP_LEVEL3_3_MENU_7, // 52
_MN_DSP_LEVEL3_3_MENU_8,
_MN_DSP_LEVEL3_4_MENU_11, // 53
_MN_DSP_LEVEL3_4_MENU_12, // 54
_MN_DSP_LEVEL3_4_MENU_21, // 55
_MN_DSP_LEVEL3_4_MENU_22, // 56
_MN_DSP_LEVEL3_4_MENU_3, // 57
_MN_DSP_LEVEL3_4_MENU_41, // 58
_MN_DSP_LEVEL3_4_MENU_42, // 59
_MN_DSP_LEVEL3_4_MENU_43, // 60
_MN_DSP_LEVEL3_4_MENU_44, // 61
_MN_DSP_LEVEL3_4_MENU_45, // 62
_MN_DSP_LEVEL3_4_MENU_51, // 63
_MN_DSP_LEVEL3_4_MENU_52, // 64
_MN_DSP_LEVEL3_4_MENU_6, // 65
_MN_DSP_LEVEL3_4_MENU_7, // 66
_MN_DSP_LEVEL3_4_MENU_8, // 67
_MN_DSP_LEVEL3_4_MENU_9, // 68
_MN_DSP_LEVEL3_4_MENU_A, // 69
_MN_DSP_LEVEL3_2_MENU_1, /* 42 发动机机油＆滤清器*/
_MN_DSP_LEVEL3_2_MENU_2, /* 43 燃油滤清器*/
_MN_DSP_LEVEL3_2_MENU_3, /* 44 变速箱油*/
_MN_DSP_LEVEL3_2_MENU_4, /* 45 差速器油*/
_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 更换燃油滤清器*/
_MN_DSP_LEVEL3_3_MENU_3, /* 52 更换变速箱油*/
_MN_DSP_LEVEL3_3_MENU_4, /* 53 更换差速器油*/
_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 设定时间*/
_MN_DSP_LEVEL3_4_MENU_3, /* 60 设定显示*/
_MN_DSP_LEVEL3_4_MENU_41, /* 61 速度设定－高速路*/
_MN_DSP_LEVEL3_4_MENU_42, /* 62 速度设定－一般路*/
_MN_DSP_LEVEL3_4_MENU_43, /* 63 发动机转速设定*/
_MN_DSP_LEVEL3_4_MENU_44, /* 64 急加速设定*/
_MN_DSP_LEVEL3_4_MENU_45, /* 65 急减速设定*/
_MN_DSP_LEVEL3_4_MENU_46, /* 66 产时间怠速设定*/
_MN_DSP_LEVEL3_4_MENU_47, /* 67 驻车解除设定*/
_MN_DSP_LEVEL3_4_MENU_5, /* 68 轮胎匹配画面*/
/*四级菜单*/
_MN_DSP_LEVEL4_1_MENU_1, // 70
_MN_DSP_LEVEL4_1_MENU_2, // 71
_MN_DSP_LEVEL4_2_MENU_1, // 72
_MN_DSP_LEVEL4_2_MENU_2, // 73
_MN_DSP_LEVEL4_4_MENU_1, // 74
_MN_DSP_LEVEL4_4_MENU_2, // 75
_MN_DSP_LEVEL4_4_MENU_3, // 76
_MN_DSP_LEVEL4_4_MENU_4, // 77
_MN_DSP_LEVEL4_4_MENU_5, // 78
_MN_DSP_LEVEL4_5_MENU_1, // 79
_MN_DSP_LEVEL4_5_MENU_2, // 80
_MN_DSP_LEVEL4_4_MENU_1, /* 69 */
_MN_DSP_LEVEL4_4_MENU_2, /* 70 */
_MN_DSP_LEVEL4_4_MENU_3, /* 71 */
_MN_DSP_LEVEL4_4_MENU_4, /* 72 */
_MN_DSP_LEVEL4_4_MENU_5, /* 73 */
_MN_DSP_LEVEL4_4_MENU_6, /* 74 */
_MN_DSP_LEVEL4_4_MENU_7, /* 75 */
_MN_DSP_LEVEL4_5_MENU_1, /* 76 */
_MN_DSP_LEVEL4_5_MENU_2, /* 77 */
/*特殊界面*/
_MN_DSP_HSAENTER_MENU, // 81
_MN_DSP_ENTER_MENU, // 82
_MN_DSP_RETURN_MENU, // 83
_MN_DSP_HSAENTER_MENU, /* 81 */
_MN_DSP_ENTER_MENU, /* 82 */
_MN_DSP_RETURN_MENU, /* 83 */
};
typedef uint8_t _MENU_IDX;
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 2fb8b813
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