Skip to content

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

调整界面

parent 00ddd6b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 23052 additions and 22872 deletions
ghs/project
View file @ 4c515d8e
No preview for this file type
ghs/project.hex
View file @ 4c515d8e
This diff is collapsed.
ghs/project.siz
View file @ 4c515d8e
project .intvect 1536
project .text 315628
project .text 316204
project .rodata 410791
project .secinfo 120
project .syscall 6
......
source/Application/APP/Key/Key_user.c
View file @ 4c515d8e
......@@ -58,7 +58,8 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*主界面 一级菜单 二级菜单那*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2))
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
/*故障码*/
if ((CanStatus1 == CAN_SIG_LOST) && (bCurMenuIDX == _MN_DSP_LEVEL2MENU_2))
......@@ -238,7 +239,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*主界面 一级菜单 二级菜单*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2))
if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_2)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
......@@ -558,11 +560,13 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{
MenuFlag.Menu_Flag = bCurMenuIDX;
if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/
/*有故障码*/
if (CanStatus1 == CAN_SIG_LOST)
{
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
else /*无故障码*/
/*无故障码*/
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
......
source/Application/Graphic/GUI/GUI.c
View file @ 4c515d8e
......@@ -83,9 +83,9 @@ void GUI_Display_Value_Init(void)
State_Flag.FState_WXTZ = 2u ;
State_Flag.FState_WXSD = 2u ;
State_Flag.FState_YHSD = 2u ;
State_Flag.FState_SYSYS = 2u ;
State_Flag.FState_TPMS = 2u ;
State_Flag.FState_ECO = 1u ;
State_Flag.FState_SYSYS = 1u ;
State_Flag.WXTZ_FDJY = 2u ;
State_Flag.WXTZ_RYLQY = 2u ;
......@@ -113,11 +113,16 @@ void GUI_Display_Value_Init(void)
State_Flag.USER_PROPOSAL = 2u ;
State_Flag.USER_HSA = 1u ;
State_Flag.USER_VOLUEM = 1u ;
State_Flag.USER_LANGUAGE = 1u ;
State_Flag.USER_LANGUAGE = 2u ;
State_Flag.USER_COMPANY = 2u ;
State_Flag.USER_LIGHT = 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 ;
State_Flag.FState_ClearOilTx = 0u;
State_Flag.FState_ClearOilRx = 1u;
State_Flag.FState_COilTimeOut = FState_COilTimeOutNum;
......@@ -186,15 +191,19 @@ void GUI_Display_Value_Init(void)
User_App.User_Gsl = 0xFFu;
User_App.User_Ybl = 0xFFu;
User_App.User_Speed = K_Line_Set.K_Line_LID45; //发动机转速
User_App.User_JADD = K_Line_Set.K_Line_LID46; //急加速
User_App.User_JSUB = K_Line_Set.K_Line_LID47; //急减速
User_App.User_Speed = K_Line_Set.K_Line_LID45; /*发动机转速*/
User_App.User_JADD = K_Line_Set.K_Line_LID46; /*急加速*/
User_App.User_JSUB = K_Line_Set.K_Line_LID47; /*急减速*/
User_App.User_IDLING = K_Line_Set.K_Line_LID48; /*长时间怠速*/
User_App.User_Parking = K_Line_Set.K_Line_LID49; /*辅助驻车*/
User_set_Num.User_Gsl = User_App.User_Gsl ;
User_set_Num.User_Ybl = User_App.User_Ybl ;
User_set_Num.User_Speed = User_App.User_Speed ;
User_set_Num.User_JADD = User_App.User_JADD ;
User_set_Num.User_JSUB = User_App.User_JSUB ;
User_set_Num.User_IDLING = User_App.User_IDLING ;
User_set_Num.User_Parking = User_App.User_Parking ;
//MenuFlag.Sig.Menu_Flag = 0;
#if 0
......@@ -1929,7 +1938,7 @@ void GUI_BG_Menu_Display(uint8_t Mode)
}
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_5)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_ECO), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_SYSYS), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else
......@@ -1944,7 +1953,7 @@ void GUI_BG_Menu_Display(uint8_t Mode)
}
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_5)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_ECO), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu1_05black + State_Flag.FState_SYSYS), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2MENU_6)
{
......@@ -5329,6 +5338,145 @@ void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_JADD_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_JADD_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_JADD;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_15, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value != 0xFF)
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*m/s2*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_JSUB_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_JSUB_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_JSUB;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_16, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value != 0xFF)
{
GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 4u, 3u, GUI_SYSSET_X, 255u, GUI_BLENDMODE_SRC_OVER);/*数字*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kmh, GUI_BLENDMODE_SRC_OVER);/*m/s2*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_IDLING_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_IDLING;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_25, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value == 0u) /*0x00-设定 0xFF-不设定*/
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_21, GUI_BLENDMODE_SRC_OVER);/*设定*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSet_SYSD_Parking_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
User_Value = User_set_Num.User_Parking;
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_26, GUI_BLENDMODE_SRC_OVER);/*Menu*/
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_kuang, GUI_BLENDMODE_SRC_OVER);/*框*/
if (User_Value == 0u) /*0x00-设定 0xFF-不设定*/
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_21, GUI_BLENDMODE_SRC_OVER);/*设定*/
}
else
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_22, GUI_BLENDMODE_SRC_OVER); /*不设定*/
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_Enter_Return_Display
* Description :
......
source/Application/Graphic/GUI/GUI.h
View file @ 4c515d8e
......@@ -90,6 +90,8 @@ typedef struct
uint8_t User_Speed; /* 发动机转速设定*/
uint8_t User_JADD; /* 急加速设定*/
uint8_t User_JSUB; /* 急减速设定*/
uint8_t User_IDLING; /* 长时间怠速*/
uint8_t User_Parking; /* 辅助驻车*/
uint8_t User_Date; /* 日期设置格式切换标识*/
uint8_t User_Time; /* 时间设置格式切换标识*/
uint8_t Date_Time; /* 显示时间日期标识*/
......@@ -288,6 +290,10 @@ void GUI_BG_TPMS_PictureSet_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_GSL_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Ybl_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Speed_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_JADD_Display(uint8_t Mode);/**/
void GUI_BG_UserSet_SYSD_JSUB_Display(uint8_t Mode);/**/
void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode);/**/
void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 4c515d8e
......@@ -1136,6 +1136,7 @@ void Level4_4Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_JADD_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_4Exit(void)
{}
......@@ -1147,6 +1148,7 @@ void Level4_4Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_JSUB_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_5Exit(void)
{}
......@@ -1158,6 +1160,7 @@ void Level4_4Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_IDLING_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_6Exit(void)
{}
......@@ -1169,6 +1172,7 @@ void Level4_4Menu_7Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSet_SYSD_Parking_Display(GUI_DISP_MODE_NORMAL);
}
void Level4_4Menu_7Exit(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