增加界面

ghs/project.siz

 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

@@ -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))
+            /*一级菜单--二级菜单*/
+            if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL2_6_MENU_1))
             {
-                MenuFlag.Menu_Flag =  bCurMenuIDX;
-
-                if (CanStatus1 == CAN_SIG_LOST) /*有故障码*/
-                {
-                    NextMenu(_MN_DSP_LEVEL2MENU_1);
-                }
-                else  /*无故障码*/
-                {
-                    NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
-                }
+                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回到用户设置界面*/
-                }
-                else
-                {
-                    NextMenu(MenuFlag.Menu_Flag);
-                }
+                MenuFlag.Menu_Return = 1;
+                NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_ENTER);
+            }
+
+
+
+
+
+
+
+
+
+            /*Go Return*/
+            else if (bCurMenuIDX == _MN_DSP_ENTER_MENU)
+            {
+                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.h

@@ -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/RTE/Common_Interface.c

@@ -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;
 }
 
 /*以下由各个处理模块按需调用*/
@@ -379,4 +384,13 @@ void K_LINE_EOL_InitVal(void)
     K_Line_Set.K_Line_LID50 = 0x00u; /* -- 预留 */
     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

@@ -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