Skip to content

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

增加时间显示配置，TBOX报警弹窗配置

parent 21d7c3c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 603 additions and 216 deletions
source/Application/APP/Key/Key_user.c
View file @ bf58bbf3
......@@ -61,6 +61,11 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
NextMenu(_MN_DSP_LEVEL2MENU_4);
}
/*背光调节----20240323*/
else if ((bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_7) && (K_Line_Set.K_Line_LID2E == 0))
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_2);
}
/*TPMS轮胎设定*/
else if ((bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_6) && (K_Line_Set.K_Line_LID3E != 0x01u))
{
......@@ -1201,8 +1206,13 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
if (((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_5_MENU_4)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
/*用户设定----20240323*/
if ((bCurMenuIDX == _MN_DSP_LEVEL2MENU_4) && (K_Line_Set.K_Line_LID2E == 0))
{
NextMenu(_MN_DSP_LEVEL2_4_MENU_1);
}
/*系统演示模式*/
if (bCurMenuIDX == _MN_DSP_LEVEL2MENU_5)
else if (bCurMenuIDX == _MN_DSP_LEVEL2MENU_5)
{
if (K_Line_Set.K_Line_LID27 == 0x01u)
{
......@@ -1378,6 +1388,7 @@ 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_LEVEL3_4_MENU_11) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_22)) ||/*日期时间*/
(bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3) || /*语言设定*/
(bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_1) || (bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_2) || /*亮度调节*/
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)) /*省油设定子菜单*/
......
source/Application/Alarm/Popups.c
View file @ bf58bbf3
......@@ -843,50 +843,59 @@ void Popups_Polling(void)
Popup_Delete(POPUP8_TemperatureThigh);
}
/* 未检测到GW*/
variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count);
if (variable_1 == CAN_SIG_LOST)
if (K_Line_Set.K_Line_LID43 == 0x40u)
{
Popup_Request(POPUP8_TBOX_GW_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_GW_Sta);
}
/* 未检测到GW*/
variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count);
if (variable_1 == CAN_SIG_LOST)
{
Popup_Request(POPUP8_TBOX_GW_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_GW_Sta);
}
/* 未检测到TBOX*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sta();
if ((variable_1 == 1) || (variable_1 == 2) || (variable_1 == 3))
{
Popup_Request(POPUP8_TBOX_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_Sta);
}
/* 未检测到TBOX*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sta();
if ((variable_1 == 1) || (variable_1 == 2) || (variable_1 == 3))
{
Popup_Request(POPUP8_TBOX_Sta);
}
else
{
Popup_Delete(POPUP8_TBOX_Sta);
}
/* TBOX通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig);
}
else
{
Popup_Delete(POPUP8_TBOX_Sig);
}
/* TBOX通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig);
}
else
{
Popup_Delete(POPUP8_TBOX_Sig);
}
/* 平台通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig_Error();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig_Error);
/* 平台通信异常*/
variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig_Error();
if (variable_1 == 1)
{
Popup_Request(POPUP8_TBOX_Sig_Error);
}
else
{
Popup_Delete(POPUP8_TBOX_Sig_Error);
}
}
else
{
Popup_Delete(POPUP8_TBOX_Sig_Error);
Popup_Clear (POPUP8_TBOX_GW_Sta );/*56.未检测到GW*/
Popup_Clear (POPUP8_TBOX_Sta );/*57.未检测到TBOX*/
Popup_Clear (POPUP8_TBOX_Sig );/*58.TBOX通信异常*/
Popup_Clear (POPUP8_TBOX_Sig_Error);/*59.平台通信异常*/
}
/*54.--8--DPD自动再生-DPD自动再生中 ID：18FED900 (AUXIO) Byte：8 bit：5,4 01(B) Engine Speed ： 350rpm以上*/
variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
......
source/Application/Graphic/GUI/GUI.c
View file @ bf58bbf3
This diff is collapsed.
source/Application/Graphic/GUI/GUI.h
View file @ bf58bbf3
......@@ -401,6 +401,11 @@ static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
static const uint16_t GUIUsetSetMPosX[2] = {463u, 440u};
static const uint16_t GUIUsetSetDPosX[2] = {570u, 547u};
static const uint16_t GUIUsetSetYPos_En[2] = {304u, 282u};
static const uint16_t GUIUsetSetYPosX_En[2] = {358u, 337u};
static const uint16_t GUIUsetSetMPosX_En[2] = {466u, 443u};
static const uint16_t GUIUsetSetDPosX_En[2] = {574u, 551u};
static const uint16_t GUIUsetSetHPosX[2] = {414u, 391u};
static const uint16_t GUIUsetSetMiPosX[2] = {490u, 467u};
......@@ -479,6 +484,7 @@ 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_UserSet_Menu_Display(uint8_t Mode); /*二级菜单--用户设定*/
void GUI_BG_UserSet_Menu1_Display(uint8_t Mode);
void GUI_BG_UserSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu3_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ bf58bbf3
......@@ -879,7 +879,14 @@ void Level2_4Menu_1Enter(void)
void Level2_4Menu_1Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu1_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_1Exit(void)
......@@ -892,7 +899,14 @@ void Level2_4Menu_2Enter(void)
void Level2_4Menu_2Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu2_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_2Exit(void)
......@@ -905,7 +919,14 @@ void Level2_4Menu_3Enter(void)
void Level2_4Menu_3Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu3_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_3Exit(void)
......@@ -918,7 +939,14 @@ void Level2_4Menu_7Enter(void)
void Level2_4Menu_7Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu8_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_7Exit(void)
......@@ -930,7 +958,14 @@ void Level2_4Menu_4Enter(void)
void Level2_4Menu_4Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu4_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_4Exit(void)
......@@ -943,7 +978,14 @@ void Level2_4Menu_5Enter(void)
void Level2_4Menu_5Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu5_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_5Exit(void)
......@@ -956,7 +998,14 @@ void Level2_4Menu_6Enter(void)
void Level2_4Menu_6Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
}
else
{
GUI_BG_UserSet_Menu1_Display(GUI_DISP_MODE_NORMAL);
}
GUI_BG_UserSetMenu6_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_6Exit(void)
......@@ -1631,8 +1680,8 @@ void Level3_4Menu_3Exit(void)
{
if (MenuFlag.Menu_Return)
{
MenuFlag.Menu_Return = 0;
User_App.User_Language = User_set_Num.User_Language ;
MenuFlag.Menu_Return = 0;
User_App.User_Language = User_set_Num.User_Language ;
K_Line_Set.User_Language = User_set_Num.User_Language ;
Common_Set_DTCstatusCHGFFK_Flag(1);
}
......
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