Skip to content

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

增加模式转换

parent 790d914a
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 9 deletions
source/Application/APP/Key/Key_user.c
View file @ 146845a7
......@@ -862,6 +862,18 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
{
K_Line_Set.K_Line_LID51 = 1u;
}
/*工厂模式*/
else if (bCurMenuIDX == _FAC_DSP_LEVEL1MENU_4)
{
K_Line_Set.K_Line_LID51 = 0x01u;
MenuFlag.Menu_StaFlag = 0x00u;
}
/*经销商模式*/
else if (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_4)
{
K_Line_Set.K_Line_LID51 = 0x01u;
MenuFlag.Menu_StaFlag = 0x02u;
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
......@@ -909,6 +921,18 @@ void Key_Operation_Enter(Key_Event_en_t enKeyEvent)
{
K_Line_Set.K_Line_LID51 = 1u;
}
/*工厂模式*/
else if (bCurMenuIDX == _FAC_DSP_LEVEL1MENU_4)
{
K_Line_Set.K_Line_LID51 = 0x01u;
MenuFlag.Menu_StaFlag = 0x00u;
}
/*经销商模式*/
else if (bCurMenuIDX == _DEA_DSP_LEVEL1MENU_4)
{
K_Line_Set.K_Line_LID51 = 0x01u;
MenuFlag.Menu_StaFlag = 0x02u;
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
......@@ -1101,8 +1125,25 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{
if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
{
/*自检模式进入经销商模式*/
if (bCurMenuIDX == _MN_DSP_Menu_Test)
{
K_Line_Set.K_Line_LID51 = 0x02u;
}
/*工厂模式*/
else if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
/*经销商模式*/
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
/*记录进入menu菜单的位置*/
if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
else if ((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6))
{
MenuFlag.Menu_Flag = bCurMenuIDX;
......@@ -1113,11 +1154,6 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{
NextMenu(MenuFlag.Menu_Flag);
}
/*自检模式进入经销商模式*/
else if (bCurMenuIDX == _MN_DSP_Menu_Test)
{
K_Line_Set.K_Line_LID51 = 0x02;
}
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
......@@ -1134,6 +1170,18 @@ void Key_Operation_Menu(Key_Event_en_t enKeyEvent)
{
K_Line_Set.K_Line_LID51 = 0x02;
}
/*工厂模式*/
else if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
/*经销商模式*/
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
}
else if (enKeyEvent == KEY_EVENT_LONG_PRESS)
{
......
source/Application/Graphic/GUI/GUI.c
View file @ 146845a7
......@@ -222,6 +222,7 @@ void GUI_Display_Value_Init(void)
MenuFlag.Menu_Flag = 0u; /*菜单初始化位置*/
MenuFlag.Meun_Test_Dealer = 0u;
MenuFlag.Menu_StaFlag = 1u; /*默认在通常模式*/
DTCNumTime = 0u;/*故障码显示时间*/
DTCNumDis = 0u;/*当前显示的故障码*/
......
source/Application/Graphic/Menu/Menu.h
View file @ 146845a7
......@@ -202,13 +202,13 @@ typedef struct
uint8_t Menu_Key_Time; /*按键长按时间记录*/
uint8_t Key_Menu_Popup_Flag; /*报警界面menu按键长按 */
uint8_t Menu_Popup_Flag; /*界面状态 0-通常 1-报警 2-工厂 3-经销商 4-仪表自我诊断*/
uint8_t MenuNum; /*未用*/
uint8_t Key_MenuTest_Long; /**/
uint8_t Key_MenuTest_ShortNum; /**/
uint8_t Menu_Factory; /*工厂模式*/
uint8_t Menu_Dealer; /*经销商模式*/
uint8_t Menu_Test; /*仪表自我诊断模式*/
uint8_t Meun_Test_Dealer; /*自我诊断模式进入经销商模式标记*/
uint8_t Menu_StaFlag; /**/
} _MenuFlag;
......
source/Application/Graphic/Menu/Menu_user.c
View file @ 146845a7
......@@ -258,6 +258,25 @@ void Level1Menu_1Do(void)
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_AVG_FuelSpeed_Display(GUI_DISP_MODE_NORMAL);
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void Level1Menu_1Exit(void)
{}
......@@ -270,6 +289,25 @@ void Level1Menu_2Do(void)
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_Battery_Display_Display(GUI_DISP_MODE_NORMAL);
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void Level1Menu_2Exit(void)
{}
......@@ -282,6 +320,25 @@ void Level1Menu_3Do(void)
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_DPD_Display_Display(GUI_DISP_MODE_NORMAL);
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void Level1Menu_3Exit(void)
{}
......@@ -294,6 +351,25 @@ void Level1Menu_4Do(void)
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_Time_OilTemp_Display(GUI_DISP_MODE_NORMAL);
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void Level1Menu_4Exit(void)
{}
......@@ -306,6 +382,25 @@ void Level1Menu_5Do(void)
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_Year_Month_Data_Display(GUI_DISP_MODE_NORMAL);
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void Level1Menu_5Exit(void)
{}
......@@ -318,6 +413,25 @@ void Level1Menu_6Do(void)
GUI_OftenShow_Display();
GUI_Dynamic_DIsplay();
GUI_block_NULL_Display(GUI_DISP_MODE_NORMAL);
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void Level1Menu_6Exit(void)
{}
......@@ -328,6 +442,25 @@ void LevelPopup_Enter(void)
void LevelPopup_Do(void)
{
GUI_General_Popup();
if (Common_Get_Menu_FacDea_Time_Sta() >= 15000u)
{
Common_Set_Menu_FacDea_Time_Sta(0x00u);
if (MenuFlag.Menu_StaFlag == 0x00u)
{
K_Line_Set.K_Line_LID51 = 0x00u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else if (MenuFlag.Menu_StaFlag == 0x02u)
{
K_Line_Set.K_Line_LID51 = 0x02u;
MenuFlag.Menu_StaFlag = 0x01u;
}
else
{
;/*Do Nothing!*/
}
}
}
void LevelPopup_Exit(void)
{}
......
source/Application/RTE/Common_Interface.c
View file @ 146845a7
......@@ -384,9 +384,9 @@ void Common_Input_Para(void)
}
/**/
if ((bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_3) || (bCurMenuIDX == _DEA_DSP_LEVEL1_2MENU_3))
if ((bCurMenuIDX == _FAC_DSP_LEVEL1_2MENU_3) || (bCurMenuIDX == _DEA_DSP_LEVEL1_2MENU_3) || (MenuFlag.Menu_StaFlag != 0x01u))
{
if (Menu_FacDea_Time < 1500u)
if (Menu_FacDea_Time < 15000u)
{
Menu_FacDea_Time++;
}
......
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