Skip to content

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

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

parent 21d7c3c1
Show 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) ...@@ -61,6 +61,11 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{ {
NextMenu(_MN_DSP_LEVEL2MENU_4); 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轮胎设定*/ /*TPMS轮胎设定*/
else if ((bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_6) && (K_Line_Set.K_Line_LID3E != 0x01u)) 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) ...@@ -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)) || 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))) ((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) if (K_Line_Set.K_Line_LID27 == 0x01u)
{ {
...@@ -1378,6 +1388,7 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent) ...@@ -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_LEVEL2_1_MENU_1) && (bCurMenuIDX < _MN_DSP_ENTER_MENU))
{ {
if ( 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_4_MENU_3) || /*语言设定*/
(bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_1) || (bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_2) || /*亮度调节*/ (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)) /*省油设定子菜单*/ ((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)) /*省油设定子菜单*/
......
source/Application/Alarm/Popups.c
View file @ bf58bbf3
...@@ -843,6 +843,8 @@ void Popups_Polling(void) ...@@ -843,6 +843,8 @@ void Popups_Polling(void)
Popup_Delete(POPUP8_TemperatureThigh); Popup_Delete(POPUP8_TemperatureThigh);
} }
if (K_Line_Set.K_Line_LID43 == 0x40u)
{
/* 未检测到GW*/ /* 未检测到GW*/
variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count); variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count);
if (variable_1 == CAN_SIG_LOST) if (variable_1 == CAN_SIG_LOST)
...@@ -886,7 +888,14 @@ void Popups_Polling(void) ...@@ -886,7 +888,14 @@ void Popups_Polling(void)
{ {
Popup_Delete(POPUP8_TBOX_Sig_Error); Popup_Delete(POPUP8_TBOX_Sig_Error);
} }
}
else
{
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以上*/ /*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(); variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
......
source/Application/Graphic/GUI/GUI.c
View file @ bf58bbf3
...@@ -49,10 +49,15 @@ uint8_t DPD_Display_Time; ...@@ -49,10 +49,15 @@ uint8_t DPD_Display_Time;
_Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/ _Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/
_TPMS TPMS_Matching; _TPMS TPMS_Matching;
#pragma ghs section bss=".myNonInitArea"
uint8_t User_App_Init_Status = 0;
_UserSet User_set_Num; _UserSet User_set_Num;
_UserSet User_App; _UserSet User_App;
#pragma ghs section bss=default
extern uint8_t BackOdoFlagSta ; extern uint8_t BackOdoFlagSta ;
static const uint16_t GUIMenuDisplayInit[2][177] = static const uint16_t GUIMenuDisplayInit[2][183] =
{ {
{ {
/* 0*/EN_User_Menu1_01black, EN_User_Menu1_01grey, EN_User_Menu1_01white, /*一级菜单--故障码*/ /* 0*/EN_User_Menu1_01black, EN_User_Menu1_01grey, EN_User_Menu1_01white, /*一级菜单--故障码*/
...@@ -114,6 +119,9 @@ static const uint16_t GUIMenuDisplayInit[2][177] = ...@@ -114,6 +119,9 @@ static const uint16_t GUIMenuDisplayInit[2][177] =
/*168*/EN_User_Menu1_10black, EN_User_Menu1_10grey, EN_User_Menu1_10white, /*工厂模式--雷达故障码清除*/ /*168*/EN_User_Menu1_10black, EN_User_Menu1_10grey, EN_User_Menu1_10white, /*工厂模式--雷达故障码清除*/
/*171*/EN_User_Menu1_11black, EN_User_Menu1_11grey, EN_User_Menu1_11white, /*工厂模式--摄像头故障码清除*/ /*171*/EN_User_Menu1_11black, EN_User_Menu1_11grey, EN_User_Menu1_11white, /*工厂模式--摄像头故障码清除*/
/*174*/EN_User_Menu1_12black, EN_User_Menu1_12grey, EN_User_Menu1_12white, /*工厂模式--液力缓速器故障码清除*/ /*174*/EN_User_Menu1_12black, EN_User_Menu1_12grey, EN_User_Menu1_12white, /*工厂模式--液力缓速器故障码清除*/
/*177*/EN_User_Menu2_04_1black, EN_User_Menu2_04_1grey, EN_User_Menu2_04_1white, /*用户设定--日期设定*/
/*180*/EN_User_Menu2_04_2black, EN_User_Menu2_04_2grey, EN_User_Menu2_04_2white, /*用户设定--时间设定*/
}, },
{ {
CN_User_Menu1_01black, CN_User_Menu1_01grey, CN_User_Menu1_01white, /*一级菜单--故障码*/ CN_User_Menu1_01black, CN_User_Menu1_01grey, CN_User_Menu1_01white, /*一级菜单--故障码*/
...@@ -175,6 +183,9 @@ static const uint16_t GUIMenuDisplayInit[2][177] = ...@@ -175,6 +183,9 @@ static const uint16_t GUIMenuDisplayInit[2][177] =
CN_User_Menu1_10black, CN_User_Menu1_10grey, CN_User_Menu1_10white, /*工厂模式--雷达故障码清除*/ CN_User_Menu1_10black, CN_User_Menu1_10grey, CN_User_Menu1_10white, /*工厂模式--雷达故障码清除*/
CN_User_Menu1_11black, CN_User_Menu1_11grey, CN_User_Menu1_11white, /*工厂模式--摄像头故障码清除*/ CN_User_Menu1_11black, CN_User_Menu1_11grey, CN_User_Menu1_11white, /*工厂模式--摄像头故障码清除*/
CN_User_Menu1_12black, CN_User_Menu1_12grey, CN_User_Menu1_12white, /*工厂模式--液力缓速器故障码清除*/ CN_User_Menu1_12black, CN_User_Menu1_12grey, CN_User_Menu1_12white, /*工厂模式--液力缓速器故障码清除*/
CN_User_Menu2_04_1black, CN_User_Menu2_04_1grey, CN_User_Menu2_04_1white, /*用户设定--日期设定*/
CN_User_Menu2_04_2black, CN_User_Menu2_04_2grey, CN_User_Menu2_04_2white, /*用户设定--时间设定*/
}, },
}; };
...@@ -189,7 +200,15 @@ static const uint16_t GUIMenuDisplayInit[2][177] = ...@@ -189,7 +200,15 @@ static const uint16_t GUIMenuDisplayInit[2][177] =
void GUI_Display_KL15_ON_Init(void) void GUI_Display_KL15_ON_Init(void)
{ {
loc_enable_mem(WET_Sprite, Calendar_Sprite); loc_enable_mem(WET_Sprite, Calendar_Sprite);
if (User_App_Init_Status == 0)
{
GUI_Display_Value_Init(); GUI_Display_Value_Init();
}
else
{
;/*Do Nothing !*/
}
//GUI_Display_background(); //GUI_Display_background();
} }
...@@ -261,7 +280,7 @@ void GUI_Display_Animation_Frame(uint16_t frame) ...@@ -261,7 +280,7 @@ void GUI_Display_Animation_Frame(uint16_t frame)
void GUI_Display_Value_Init(void) void GUI_Display_Value_Init(void)
{ {
uint8_t i = 0u; uint8_t i = 0u;
User_App_Init_Status = 1u;
/*菜单状态初始化*/ /*菜单状态初始化*/
State_Flag.FState_GZM = 2u ; State_Flag.FState_GZM = 2u ;
State_Flag.FState_WXTZ = 2u ; State_Flag.FState_WXTZ = 2u ;
...@@ -596,6 +615,9 @@ void GUI_Time_Dispaly(uint8_t Mode) ...@@ -596,6 +615,9 @@ void GUI_Time_Dispaly(uint8_t Mode)
uint8_t Time_Minutes = 0u; uint8_t Time_Minutes = 0u;
uint8_t CanStatus = 0u; uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{
//if (K_Line_Set.K_Line_LID54 == 0x01u)
if (K_Line_Set.K_Line_LID2E == 0x01u)
{ {
/*T_BOX 时间显示*/ /*T_BOX 时间显示*/
CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count); CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
...@@ -623,6 +645,45 @@ void GUI_Time_Dispaly(uint8_t Mode) ...@@ -623,6 +645,45 @@ void GUI_Time_Dispaly(uint8_t Mode)
} }
} }
else else
{
/*时*/
Time_Hours = Get_RTC_HOUR();
if (0u) /*12小时*/
{
if (Time_Hours == 0)
{
GUI_General_Digit_Display(Time_Sprite, (Time_Hours + 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER);
}
else if (Time_Hours > 12u)
{
GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* PM */
}
else
{
GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* AM */
}
}
else
{
GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示小时*/
}
/*分钟*/
if (FLASH_SYNC_1Hz)
{
GUI_Translate_Display(Time_Sprite, Nb_21_maohao, 396u, 45u, GUI_BLENDMODE_SRC_OVER); /*显示冒号*/
}
else
{
GUI_General_Display(Time_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
Time_Minutes = Get_RTC_MINUTE();
GUI_General_Digit_Display(Time_Sprite, Time_Minutes, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
}
}
else
{ {
GUI_General_Display(Time_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(Time_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -659,6 +720,9 @@ void GUI_Data_Dispaly(uint8_t Mode) ...@@ -659,6 +720,9 @@ void GUI_Data_Dispaly(uint8_t Mode)
uint8_t CanStatus = 0u; uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{
//if (K_Line_Set.K_Line_LID54 == 0x01u)
if (K_Line_Set.K_Line_LID2E == 0x01u)
{ {
CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count); CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
...@@ -743,6 +807,30 @@ void GUI_Data_Dispaly(uint8_t Mode) ...@@ -743,6 +807,30 @@ void GUI_Data_Dispaly(uint8_t Mode)
} }
} }
else else
{
Year = 2000 + Get_RTC_YEAR();
Month = Get_RTC_MONTH();
Date = Get_RTC_DATE();
Week = Get_RTC_WEEK();
GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示年份后面的 “ . ” */
GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 642u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示月份后面的 “ . ” */
GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER); /*显示年*/
GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER); /*显示日*/
if (User_App.User_Language == Language_Cn)
{
GUI_General_Display(Calendar_Sprite, GUIWedk_Cn[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
}
else if (User_App.User_Language == Language_En)
{
GUI_General_Display(Calendar_Sprite, GUIWedk_En[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
}
}
}
else
{ {
GUI_General_Display(Calendar_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(Calendar_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -2334,6 +2422,9 @@ void GUI_Year_Month_Data_Display(uint8_t Mode) ...@@ -2334,6 +2422,9 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
uint8_t CanStatus = 0u; uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{
//if (K_Line_Set.K_Line_LID54 == 0x01u)
if (K_Line_Set.K_Line_LID2E == 0x01u)
{ {
Year = (uint16_t)Get_ID_18FEE64A_Sig_TBOX_Year(); Year = (uint16_t)Get_ID_18FEE64A_Sig_TBOX_Year();
Year = (Year & 0xFF) + 1985u; Year = (Year & 0xFF) + 1985u;
...@@ -2463,6 +2554,104 @@ void GUI_Year_Month_Data_Display(uint8_t Mode) ...@@ -2463,6 +2554,104 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
} }
} }
else else
{
Year = 2000 + Get_RTC_YEAR();
Month = Get_RTC_MONTH();
Date = Get_RTC_DATE();
Week = Get_RTC_WEEK();
/*年月日*/
if (1u)
{
if (User_App.User_Language == Language_Cn)
{
/*年月日*/
GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*日*/
GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 0u, GUI_DISP_MENUYear, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate, 243u, GUI_BLENDMODE_SRC_OVER);
/*星期*/
GUI_General_Display(MultiPurpose_Sprite, CN_kuohao, GUI_BLENDMODE_SRC_OVER); /*括号*/
GUI_General_Display(MultiPurpose_Sprite, GUIMenuWedk_CN[Week], GUI_BLENDMODE_CUSTOM);
}
else if (User_App.User_Language == Language_En)
{
/*年月日*/
GUI_General_Display(MultiPurpose_Sprite, EN_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MultiPurpose_Sprite, EN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MultiPurpose_Sprite, EN_ri, GUI_BLENDMODE_SRC_OVER); /*日*/
GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 0u, GUI_DISP_MENUYear_EN, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth_EN, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate_EN, 243u, GUI_BLENDMODE_SRC_OVER);
/*星期*/
GUI_General_Display(MultiPurpose_Sprite, EN_kuohao, GUI_BLENDMODE_SRC_OVER); /*括号*/
GUI_General_Display(MultiPurpose_Sprite, GUIMenuWedk_EN[Week], GUI_BLENDMODE_CUSTOM);
}
}
/*月日年*/
else if (0)
{
GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*日*/
GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 1u, GUI_DISP_MENUYear1, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth1, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate1, 243u, GUI_BLENDMODE_SRC_OVER);
}
/*日月年*/
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*日*/
GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 1u, GUI_DISP_MENUYear1, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate1, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth1, 243u, GUI_BLENDMODE_SRC_OVER);
}
Time_Hours = Get_RTC_HOUR();
/*时间*/
if (0u)
{
if (Time_Hours < 12)
{
GUI_General_Display(MultiPurpose_Sprite, CN_AM, GUI_BLENDMODE_SRC_OVER); /*AM*/
}
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_PM, GUI_BLENDMODE_SRC_OVER); /*PM*/
}
if (Time_Hours == 0)
{
GUI_General_Digit_Display(MultiPurpose_Sprite, (Time_Hours + 12u), Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
}
else if (Time_Hours > 12)
{
GUI_General_Digit_Display(MultiPurpose_Sprite, (Time_Hours - 12u), Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); /*PM*/
}
else
{
GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); /*AM*/
}
}
else
{
GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 0u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
}
Time_Minutes = Get_RTC_MINUTE();
GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Minutes, Nb_17_0, 2u, 0u, GUI_DISP_MENUMinutes, 279u, GUI_BLENDMODE_SRC_OVER); /*分钟*/
GUI_Translate_Display(MultiPurpose_Sprite, Nb_17_maohao, 592u, 282u, GUI_BLENDMODE_CUSTOM); /*冒号*/
}
}
else
{ {
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3396,6 +3585,75 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode) ...@@ -3396,6 +3585,75 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
} }
} }
void GUI_BG_UserSet_Menu1_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*显示*/
if (User_App.User_Language == Language_Cn)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu3_03_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
}
else if (User_App.User_Language == Language_En)
{
GUI_General_Display(MENU_Sprite, EN_User_Menu3_03_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
}
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度条*/
if (bCurMenuIDX <= _MN_DSP_LEVEL2_4_MENU_3)
{
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_1)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][177 + State_Flag.USER_DATE], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_2)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][180 + State_Flag.USER_TIME], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_7)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][54 + State_Flag.USER_LIGHT], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + State_Flag.USER_LANGUAGE], 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_4)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][180 + State_Flag.USER_TIME], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][54 + State_Flag.USER_LIGHT], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + State_Flag.USER_LANGUAGE], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_5)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][54 + State_Flag.USER_LIGHT], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + State_Flag.USER_LANGUAGE], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][60 + State_Flag.USER_PROPOSAL], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + State_Flag.USER_LANGUAGE], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][60 + State_Flag.USER_PROPOSAL], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
if (K_Line_Set.K_Line_LID3E != 0x01u)
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][63 + 1u], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][63 + State_Flag.FState_TPMSSET], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
}
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSetMenu1_Display * Function Name : GUI_BG_UserSetMenu1_Display
* Description : * Description :
...@@ -3410,7 +3668,7 @@ void GUI_BG_UserSetMenu1_Display(uint8_t Mode) ...@@ -3410,7 +3668,7 @@ void GUI_BG_UserSetMenu1_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_1black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][177 + Flag], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -3432,7 +3690,7 @@ void GUI_BG_UserSetMenu2_Display(uint8_t Mode) ...@@ -3432,7 +3690,7 @@ void GUI_BG_UserSetMenu2_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][180 + Flag], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -3453,10 +3711,17 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode) ...@@ -3453,10 +3711,17 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
uint8_t Flag = 0; uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{
if (K_Line_Set.K_Line_LID2E == 0x01u)
{ {
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + Flag], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + Flag], 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][57 + Flag], 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3475,10 +3740,17 @@ void GUI_BG_UserSetMenu8_Display(uint8_t Mode) ...@@ -3475,10 +3740,17 @@ void GUI_BG_UserSetMenu8_Display(uint8_t Mode)
uint8_t Flag = 0; uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{
if (K_Line_Set.K_Line_LID2E == 0x01u)
{ {
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][54 + Flag], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][54 + Flag], 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][54 + Flag], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -3497,10 +3769,17 @@ void GUI_BG_UserSetMenu4_Display(uint8_t Mode) ...@@ -3497,10 +3769,17 @@ void GUI_BG_UserSetMenu4_Display(uint8_t Mode)
uint8_t Flag = 0; uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{
if (K_Line_Set.K_Line_LID2E == 0x01u)
{ {
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][60 + Flag], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][60 + Flag], 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
} }
else else
{
GUI_Translate_Display(MENU_Sprite, GUIMenuDisplayInit[User_App.User_Language][60 + Flag], 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
}
else
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
} }
...@@ -5885,7 +6164,40 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode) ...@@ -5885,7 +6164,40 @@ void GUI_BG_UserSet_Date_Display(uint8_t Mode)
} }
else if (User_App.User_Language == Language_En) else if (User_App.User_Language == Language_En)
{ {
;//此功能暂时删除了，增加再贴。 GUI_General_Display(MENU_Sprite, EN_User_Menu3_03_nian, GUI_BLENDMODE_SRC_OVER); /*年*/
GUI_General_Display(MENU_Sprite, EN_User_Menu3_03_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MENU_Sprite, EN_User_Menu3_03_ri, GUI_BLENDMODE_SRC_OVER); /*日*/
switch (bCurMenuIDX)
{
case _MN_DSP_LEVEL3_4_MENU_11:
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 329, 214u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 435u, 214u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 544u, 214u, GUI_BLENDMODE_SRC_OVER);
break;
case _MN_DSP_LEVEL3_4_MENU_12:
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 329, 214u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 435u, 214u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 544u, 214u, GUI_BLENDMODE_SRC_OVER);
break;
case _MN_DSP_LEVEL3_4_MENU_13:
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 329, 214u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_greykuang, 435u, 214u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_User_Menu3_03_yellowkuang, 544u, 214u, GUI_BLENDMODE_SRC_OVER);
break;
default:
break;
}
GUI_General_Digit_Display(MENU_Sprite, 20u, Nb_20_0, 2u, 0u, GUIUsetSetYPos_En, 226u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, YEAR_Value, Nb_20_0, 2u, 0u, GUIUsetSetYPosX_En, 226u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, MOnth_Value, Nb_20_0, 2u, 0u, GUIUsetSetMPosX_En, 226u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MENU_Sprite, Data_Value, Nb_20_0, 2u, 0u, GUIUsetSetDPosX_En, 226u, GUI_BLENDMODE_SRC_OVER);
} }
} }
else else
......
source/Application/Graphic/GUI/GUI.h
View file @ bf58bbf3
...@@ -401,6 +401,11 @@ static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u}; ...@@ -401,6 +401,11 @@ static const uint16_t GUIUsetSetYPosX[2] = {358u, 337u};
static const uint16_t GUIUsetSetMPosX[2] = {463u, 440u}; static const uint16_t GUIUsetSetMPosX[2] = {463u, 440u};
static const uint16_t GUIUsetSetDPosX[2] = {570u, 547u}; 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 GUIUsetSetHPosX[2] = {414u, 391u};
static const uint16_t GUIUsetSetMiPosX[2] = {490u, 467u}; static const uint16_t GUIUsetSetMiPosX[2] = {490u, 467u};
...@@ -479,6 +484,7 @@ void GUI_BG_RepSetMenu6_Display(uint8_t Mode); /**/ ...@@ -479,6 +484,7 @@ void GUI_BG_RepSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu7_Display(uint8_t Mode); /**/ void GUI_BG_RepSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_RepSetMenu8_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_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_UserSetMenu1_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/ void GUI_BG_UserSetMenu2_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu3_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) ...@@ -879,7 +879,14 @@ void Level2_4Menu_1Enter(void)
void Level2_4Menu_1Do(void) void Level2_4Menu_1Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu1_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_1Exit(void) void Level2_4Menu_1Exit(void)
...@@ -892,7 +899,14 @@ void Level2_4Menu_2Enter(void) ...@@ -892,7 +899,14 @@ void Level2_4Menu_2Enter(void)
void Level2_4Menu_2Do(void) void Level2_4Menu_2Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu2_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_2Exit(void) void Level2_4Menu_2Exit(void)
...@@ -905,7 +919,14 @@ void Level2_4Menu_3Enter(void) ...@@ -905,7 +919,14 @@ void Level2_4Menu_3Enter(void)
void Level2_4Menu_3Do(void) void Level2_4Menu_3Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu3_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_3Exit(void) void Level2_4Menu_3Exit(void)
...@@ -918,7 +939,14 @@ void Level2_4Menu_7Enter(void) ...@@ -918,7 +939,14 @@ void Level2_4Menu_7Enter(void)
void Level2_4Menu_7Do(void) void Level2_4Menu_7Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu8_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_7Exit(void) void Level2_4Menu_7Exit(void)
...@@ -930,7 +958,14 @@ void Level2_4Menu_4Enter(void) ...@@ -930,7 +958,14 @@ void Level2_4Menu_4Enter(void)
void Level2_4Menu_4Do(void) void Level2_4Menu_4Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu4_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_4Exit(void) void Level2_4Menu_4Exit(void)
...@@ -943,7 +978,14 @@ void Level2_4Menu_5Enter(void) ...@@ -943,7 +978,14 @@ void Level2_4Menu_5Enter(void)
void Level2_4Menu_5Do(void) void Level2_4Menu_5Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu5_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_5Exit(void) void Level2_4Menu_5Exit(void)
...@@ -956,7 +998,14 @@ void Level2_4Menu_6Enter(void) ...@@ -956,7 +998,14 @@ void Level2_4Menu_6Enter(void)
void Level2_4Menu_6Do(void) void Level2_4Menu_6Do(void)
{ {
GUI_OftenShow_Display(); GUI_OftenShow_Display();
if (K_Line_Set.K_Line_LID2E == 0x01u)
{
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL); 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); GUI_BG_UserSetMenu6_Display(GUI_DISP_MODE_NORMAL);
} }
void Level2_4Menu_6Exit(void) void Level2_4Menu_6Exit(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