Skip to content

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

增加界面

parent 662d87dc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 23834 additions and 22887 deletions
ghs/project
View file @ ccadbfba
No preview for this file type
ghs/project.hex
View file @ ccadbfba
This diff is collapsed.
ghs/project.siz
View file @ ccadbfba
project .intvect 1536
project .text 295052
project .rodata 408927
project .text 297308
project .rodata 409343
project .secinfo 120
project .syscall 6
project .romdata 9037
......
source/Application/APP/Key/Key_user.c
View file @ ccadbfba
......@@ -68,6 +68,22 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
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_4_MENU_8)
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_4);
}
else if (bCurMenuIDX == _MN_DSP_LEVEL2_6_MENU_1 ) /*胎压显示*/
{
Common_Set_TPMS_Kpa_Temp_Flag(1u);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
}
}
}
else
......@@ -105,6 +121,30 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
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_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)
{
Common_Set_TPMS_Kpa_Temp_Flag(0u);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
}
}
}
else
......@@ -122,43 +162,41 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
*******************************ENTER***********************************************/
void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
{
uint8_t CanStatus1 = 0u;
uint16_t DispVSpeed = 0u;
KeyTest.Enter ++ ;
HMI_Set_KEY_CONFIRM(enKeyEvent);
DispVSpeed = Common_Get_Disp_V_Speed();
CanStatus1 = CAN_MSG_Status(ID_CanMsg0CF00400_Msg_Count);
if (DispVSpeed <= DISPSPEEDNULLMAX)
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*记录进入MENU菜单的位置*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
{
MenuFlag.Menu_Flag = bCurMenuIDX;
if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/
{
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
else /*无故障码*/
/*一级菜单--二级菜单*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
}
/*无论从哪都能回去*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_RETURN_MENU))
/*三级菜单保养设定*/
else if ((bCurMenuIDX >= _MN_DSP_LEVEL3_3_MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL3_3_MENU_7))
{
if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_A) /*胎压设置界面*/
{
NextMenu(_MN_DSP_LEVEL2MENU_4); /*menu回到用户设置界面*/
MenuFlag.Menu_Return = 1;
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
}
else
/*Go Return*/
else if (bCurMenuIDX == _MN_DSP_ENTER_MENU)
{
NextMenu(MenuFlag.Menu_Flag);
}
MenuFlag.Menu_Return = 1;
NextMenu(_MN_DSP_RETURN_MENU);
}
}
}
......@@ -257,11 +295,15 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
*******************************Menu***********************************************/
void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{
uint8_t CanStatus1 = 0u;
uint16_t DispVSpeed = 0u;
KeyTest.Menu ++ ;
HMI_Set_KEY_MENU(enKeyEvent);
DispVSpeed = Common_Get_Disp_V_Speed();
CanStatus1 = CAN_MSG_Status(ID_CanMsg0CF00400_Msg_Count);
if (DispVSpeed <= DISPSPEEDNULLMAX)
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
......@@ -271,7 +313,7 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{
MenuFlag.Menu_Flag = bCurMenuIDX;
if (0) /*有故障码*/
if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/
{
NextMenu(_MN_DSP_LEVEL2MENU_1);
}
......
source/Application/Graphic/GUI/GUI.c
View file @ ccadbfba
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ ccadbfba
......@@ -105,14 +105,33 @@ void GUI_Time_OilTemp_Display(uint8_t Mode); /*转速
void GUI_Time_OilTemp_OFF_Display(uint8_t Mode); /*OFF 转速时间-油温*/
void GUI_Year_Month_Data_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_Menu2_Display(uint8_t Mode);
void GUI_BG_Menu3_Display(uint8_t Mode);
void GUI_BG_Menu4_Display(uint8_t Mode);
void GUI_BG_Menu5_Display(uint8_t Mode);
void GUI_BG_Menu6_Display(uint8_t Mode);
void GUI_BG_Rep_Menu_Display(uint8_t Mode); /*二级菜单项保养通知*/
void GUI_BG_RepMenu1_Display(uint8_t Mode);
void GUI_BG_RepMenu2_Display(uint8_t Mode);
void GUI_BG_RepMenu3_Display(uint8_t Mode);
void GUI_BG_RepMenu4_Display(uint8_t Mode);
void GUI_BG_RepMenu5_Display(uint8_t Mode);
void GUI_BG_RepMenu6_Display(uint8_t Mode);
void GUI_BG_RepMenu7_Display(uint8_t Mode);
void GUI_BG_RepMenu8_Display(uint8_t Mode);
void GUI_BG_RepMenu9_Display(uint8_t Mode);
/*二级菜单保养通知设定*/
void GUI_BG_RepSetMenu1_Display(uint8_t Mode);
void GUI_BG_RepSetMenu2_Display(uint8_t Mode);
void GUI_BG_RepSetMenu3_Display(uint8_t Mode);
void GUI_BG_RepSetMenu4_Display(uint8_t Mode);
void GUI_BG_RepSetMenu5_Display(uint8_t Mode);
void GUI_BG_RepSetMenu6_Display(uint8_t Mode);
void GUI_BG_RepSetMenu7_Display(uint8_t Mode);
void GUI_BG_RepSetMenu8_Display(uint8_t Mode);
void GUI_BG_RepSetMenu9_Display(uint8_t Mode);
......
source/Application/Graphic/Menu/Menu.h
View file @ ccadbfba
......@@ -32,16 +32,17 @@ typedef enum
_MN_DSP_LEVEL2MENU_6, /* 12 轮胎状态显示*/
/*二级菜单*/
_MN_DSP_LEVEL2_1_MENU_1, // 13
_MN_DSP_LEVEL2_2_MENU_1, // 14
_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, // 21
_MN_DSP_LEVEL2_2_MENU_6, // 18
_MN_DSP_LEVEL2_2_MENU_7, // 19
_MN_DSP_LEVEL2_2_MENU_8, // 20
_MN_DSP_LEVEL2_2_MENU_9, // 21
_MN_DSP_LEVEL2_1_MENU_1, /* 13 故障码*/
_MN_DSP_LEVEL2_2_MENU_1, /* 14 发动机机油&滤清器*/
_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, /* 离合油*/
_MN_DSP_LEVEL2_2_MENU_6, /* 18 空气干燥器干燥剂*/
_MN_DSP_LEVEL2_2_MENU_7, /* 19 动力转向液*/
_MN_DSP_LEVEL2_2_MENU_8, /* 20 轮胎*/
_MN_DSP_LEVEL2_2_MENU_9, /* 21 起动机*/
_MN_DSP_LEVEL2_3_MENU_1, // 22
_MN_DSP_LEVEL2_3_MENU_2, // 23
......@@ -74,7 +75,7 @@ typedef enum
_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 , //50
_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
......@@ -84,7 +85,7 @@ typedef enum
_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 , //59
_MN_DSP_LEVEL3_3_MENU_5, //
_MN_DSP_LEVEL3_3_MENU_6, // 51
_MN_DSP_LEVEL3_3_MENU_7, // 52
......@@ -138,21 +139,20 @@ typedef struct
void (*Exit)(void);
} _MenuOptTab;
typedef struct
{
uint8_t Menu_Flag ; /*主界面标记*/
uint8_t Menu_Time_Flag ; /*从Enter界面确认退出计时*/
uint8_t Menu_Enter_Return ; /*进入Enter之前界面*/
uint8_t Menu_Return ; /*Enter Return界面切换标记*/
uint8_t Menu_Key_Time ; /*按键长按时间记录*/
uint16_t Key_Menu_Popup_time ; /*上述状态持续时间*/
uint8_t Key_Menu_Popup_Flag ; /*报警界面menu按键长按 */
uint8_t Menu_Light_Time ;
uint8_t Menu_Light_Time_Flag ;
uint8_t Menu_Flag; /*主界面标记*/
uint8_t Menu_Time_Flag; /*从Enter界面确认退出计时*/
uint8_t Menu_Enter_Return; /*进入Enter之前界面*/
uint8_t Menu_Return; /*Enter Return界面切换标记*/
uint8_t Menu_Key_Time; /*按键长按时间记录*/
uint16_t Key_Menu_Popup_time; /*上述状态持续时间*/
uint8_t Key_Menu_Popup_Flag; /*报警界面menu按键长按 */
uint8_t Menu_Light_Time;
uint8_t Menu_Light_Time_Flag;
} _MenuFlag;
EXTERN_MEU_PROCESS _MenuFlag MenuFlag ;
EXTERN_MEU_PROCESS _MenuFlag MenuFlag;
EXTERN_MEU_PROCESS uint8_t bMenuSwFlag;
EXTERN_MEU_PROCESS uint8_t g_ClearWin1;
......@@ -222,25 +222,25 @@ EXTERN_MEU_PROCESS void Level2_1Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level2_1Menu_1Do(void);
EXTERN_MEU_PROCESS void Level2_1Menu_1Exit(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_2Enter(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_2Do(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_2Exit(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_2Enter(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_2Do(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_2Exit(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_3Enter(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_3Do(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_3Exit(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_3Enter(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_3Do(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_3Exit(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_4Enter(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_4Do(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_4Exit(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_4Enter(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_4Do(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_4Exit(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_5Enter(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_5Do(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_5Exit(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_5Enter(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_5Do(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_5Exit(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_6Enter(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_6Do(void);
//EXTERN_MEU_PROCESS void Level2_1Menu_6Exit(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_6Enter(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_6Do(void);
// EXTERN_MEU_PROCESS void Level2_1Menu_6Exit(void);
EXTERN_MEU_PROCESS void Level2_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level2_2Menu_1Do(void);
......@@ -342,29 +342,29 @@ EXTERN_MEU_PROCESS void Level2_4Menu_9Enter(void);
EXTERN_MEU_PROCESS void Level2_4Menu_9Do(void);
EXTERN_MEU_PROCESS void Level2_4Menu_9Exit(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_1Enter(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_1Do(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_1Exit(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_1Enter(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_1Do(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_1Exit(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_2Enter(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_2Do(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_2Exit(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_2Enter(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_2Do(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_2Exit(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_3Enter(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_3Do(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_3Exit(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_3Enter(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_3Do(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_3Exit(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_4Enter(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_4Do(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_4Exit(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_4Enter(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_4Do(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_4Exit(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_5Enter(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_5Do(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_5Exit(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_5Enter(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_5Do(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_5Exit(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_6Enter(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_6Do(void);
//EXTERN_MEU_PROCESS void Level3_1Menu_6Exit(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_6Enter(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_6Do(void);
// EXTERN_MEU_PROCESS void Level3_1Menu_6Exit(void);
EXTERN_MEU_PROCESS void Level3_2Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level3_2Menu_1Do(void);
......@@ -402,7 +402,6 @@ 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);
......@@ -431,7 +430,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_4Menu_1Enter_1(void);
EXTERN_MEU_PROCESS void Level3_4Menu_1Do_1(void);
EXTERN_MEU_PROCESS void Level3_4Menu_1Exit_1(void);
......@@ -552,19 +550,19 @@ EXTERN_MEU_PROCESS void Level_Return_Menu_Enter(void);
EXTERN_MEU_PROCESS void Level_Return_Menu_Do(void);
EXTERN_MEU_PROCESS void Level_Return_Menu_Exit(void);
EXTERN_MEU_PROCESS void Level2Menu_7Enter(void); //----̥ѹÏÔʾѡÏî
EXTERN_MEU_PROCESS void Level2Menu_7Enter(void);
EXTERN_MEU_PROCESS void Level2Menu_7Do(void);
EXTERN_MEU_PROCESS void Level2Menu_7Exit(void);
EXTERN_MEU_PROCESS void Level2_7Menu_1Enter(void); //----̥ѹÏÔʾ½çÃæ
EXTERN_MEU_PROCESS void Level2_7Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level2_7Menu_1Do(void);
EXTERN_MEU_PROCESS void Level2_7Menu_1Exit(void);
EXTERN_MEU_PROCESS void Level2_4Menu_AEnter(void); //----̥ѹÉèÖÃÑ¡Ïî
EXTERN_MEU_PROCESS void Level2_4Menu_AEnter(void);
EXTERN_MEU_PROCESS void Level2_4Menu_ADo(void);
EXTERN_MEU_PROCESS void Level2_4Menu_AExit(void);
EXTERN_MEU_PROCESS void Level3_4Menu_AEnter(void); //----̥ѹÉèÖÃÏÔʾ½çÃæ
EXTERN_MEU_PROCESS void Level3_4Menu_AEnter(void);
EXTERN_MEU_PROCESS void Level3_4Menu_ADo(void);
EXTERN_MEU_PROCESS void Level3_4Menu_AExit(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ ccadbfba
This diff is collapsed.
source/Application/RTE/Common_Interface.c
View file @ ccadbfba
......@@ -53,6 +53,8 @@ static uint8_t CanFirstEvent[ID_TOTAL_MAX];
static void Individual_ECU_Communication(void);
// wangboyu - end
/*TPMS界面胎温胎压切换标记*/
static uint8_t TPMS_Kpa_Temp_Flag ;
_EOL_K_LINE_SET K_Line_Set;
/*每次唤醒调用*/
......@@ -71,6 +73,9 @@ void Common_DataInit(void)
Disp_E_Speed_Valid = COMMON_Valid_UNKNOW;
PowerIgnOnTimeLine = 0x0ul;
PowerIgnOffTimeLine = 0x0ul;
TPMS_Kpa_Temp_Flag = 0x00u;
}
/*以下由各个处理模块按需调用*/
......@@ -380,3 +385,12 @@ void K_LINE_EOL_InitVal(void)
K_Line_Set.K_Line_LID51 = 0x01u; /* 01 工作模式 */
K_Line_Set.K_Line_LID52 = 0x00u; /* 00 电子部件设定 */
}
void Common_Set_TPMS_Kpa_Temp_Flag (uint8_t Val)
{
TPMS_Kpa_Temp_Flag = Val;
}
uint8_t Common_Get_TPMS_Kpa_Temp_Flag(void)
{
return TPMS_Kpa_Temp_Flag ;
}
\ No newline at end of file
source/Application/RTE/Common_Interface.h
View file @ ccadbfba
......@@ -129,4 +129,7 @@ uint8_t Get_CanFirstRecv_Event(uint8_t ID);
void ReadDTCEOLValue_Meter_K_LINE(void);
void K_LINE_EOL_InitVal(void);
void Common_Set_TPMS_Kpa_Temp_Flag (uint8_t Val);
uint8_t Common_Get_TPMS_Kpa_Temp_Flag(void);
#endif
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