增加各种模式，Test版本

source/Application/APP/Key/Key_user.c

@@ -1098,9 +1098,32 @@ void Key_Operation_ODOTrip (Key_Event_en_t enKeyEvent)
     HMI_MENU_Sta = Get_Cur_HMI();
     DispVSpeed = Common_Get_Disp_V_Speed();
 
-    if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
+    if (enKeyEvent == KEY_EVENT_OFF_TO_ON)
     {
-        if (User_set_Num.Trip_Type == 0u)
+        MenuFlag.Key_MenuTest_Long = 1u;
+    }
+    else if (enKeyEvent == KEY_EVENT_SHORT_PRESS)
+    {
+        if (HMI_MENU_Sta == Display_StartAnimation)
+        {
+            if (MenuFlag.Key_MenuTest_ShortNum < 100u)
+            {
+                MenuFlag.Key_MenuTest_ShortNum++;
+            }
+
+            /*进入自检模式*/
+            //if ((MenuFlag.Key_MenuTest_Long == 1u) && (MenuFlag.Key_MenuTest_ShortNum >= 3u))
+            if (MenuFlag.Key_MenuTest_ShortNum >= 3u)
+            {
+                MenuFlag.Menu_Test = 1u;
+                MenuFlag.Key_MenuTest_ShortNum  = 0u;
+            }
+        }
+        else if (bCurMenuIDX == _MN_DSP_Menu_Test)
+        {
+
+        }
+        else if (User_set_Num.Trip_Type == 0u)
         {
             User_set_Num.Trip_Type  = 1u;
         }

source/Application/APP/SEG_LCD/SEG_DISPLAY.c

@@ -7,6 +7,7 @@
 #include "Data_EngineSpeed.h"
 #include "Data_VehicleSpeed.h"
 #include "GaugesInterface.h"
+#include "Menu.h"
 
 #define PRI_SEG_NUM_MAX 17U
 #define SEC_SEG_NUM_MAX 17U
@@ -1030,7 +1031,7 @@ void Seg_Display_Service(void)
     Ign_Time = Common_GetIgnOnTime();
     if (Common_Get_IG_Sts() == COMMON_POWER_ON)
     {
-        if (IC_TEST == 1)
+        if (MenuFlag.Menu_Popup_Flag == 4u)
         {
             /*测试用点亮全部断码*/
             /*Seg_Display_ON();*/

source/Application/Graphic/GUI/GUI.c

@@ -1840,6 +1840,38 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode)
     }
 }
 
+/*--------------------------------------------------------------------------
+ * Function Name  : GUI_Test_Display
+ * Description    :
+ * Input          : None
+ * Output         : None
+ * Return         : None
+ * onther         : 区域
+ --------------------------------------------------------------------------*/
+void GUI_Test_Display(uint8_t Mode)
+{
+    if (Mode == GUI_DISP_MODE_NORMAL)
+    {
+        GUI_General_Display(MENU_Sprite, CN_Menu_HV, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Display(MENU_Sprite, CN_Menu_SV, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Display(MENU_Sprite, CN_Menu_FV, GUI_BLENDMODE_SRC_OVER);
+
+        GUI_Translate_Display(MENU_Sprite, CN_Nb_28_dian, 446u, 137u, GUI_BLENDMODE_CUSTOM); /*点*/
+        GUI_Translate_Display(MENU_Sprite, CN_Nb_28_dian, 518u, 137u, GUI_BLENDMODE_CUSTOM); /*点*/
+        GUI_Translate_Display(MENU_Sprite, CN_Nb_28_dian, 446u, 200u, GUI_BLENDMODE_CUSTOM); /*点*/
+        GUI_Translate_Display(MENU_Sprite, CN_Nb_28_dian, 518u, 200u, GUI_BLENDMODE_CUSTOM); /*点*/
+        GUI_Translate_Display(MENU_Sprite, CN_Nb_28_dian, 518u, 264u, GUI_BLENDMODE_CUSTOM); /*点*/
+
+        GUI_General_Digit_Display(MENU_Sprite, SystemSupplierECUHardwareVersionNumberApp, CN_Nb_28_0, 6u, 0u, GUIBGTestPosX, 137u, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Digit_Display(MENU_Sprite, SystemSupplierECUSoftwareInformationApp, CN_Nb_28_0, 6u, 0u, GUIBGTestPosX, 200u, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Digit_Display(MENU_Sprite, systemSupplierECUFlashInformationApp, CN_Nb_28_0, 6u, 2u, GUIBGTestPosX, 264u, GUI_BLENDMODE_SRC_OVER);
+    }
+    else
+    {
+        GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+    }
+}
+
 /*--------------------------------------------------------------------------
  * Function Name  : GUI_Year_Month_Data_Display
  * Description    : 年月日显示

source/Application/Graphic/GUI/GUI.h

@@ -288,6 +288,8 @@ static const uint16_t GUIUsetSetMiPosX[2] = {490u, 467u};
 static const uint16_t GUIBGAVGSpeedPosX[4] = {667u, 642u, 617u, 592u};
 static const uint16_t GUIBGAVGFuelPosX[4] = {667u, 628u, 603u, 578u};
 
+static const uint16_t GUIBGTestPosX[6] = {569u, 540u, 497u, 468u, 424u, 395u};
+
 extern void GUI_Display_KL15_ON_Init(void);
 extern void GUI_Display_KL15_OFF_Init(void);
 extern void GUI_Display_Value_Init(void); /*显示数据初始化*/
@@ -423,7 +425,7 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode);               /*SCR故障*/
 void GUI_BG_DTCAMT_Display(uint8_t Mode);               /*AMT故障*/
 
 void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
-
+void GUI_Test_Display(uint8_t Mode);
 void Common_EOL_User_Server(void);
 
 /*-----报警--------------------------------------------------------*/

source/Application/Graphic/Menu/Menu.h

@@ -118,7 +118,8 @@ typedef enum
     _MN_DSP_LEVEL3_5_MENU_3, /* 78 AEBS第2警报演示*/
     _MN_DSP_LEVEL3_5_MENU_4, /* 79 AEBS全力制动警报演示*/
 
-    _MN_DSP_Menu_OFF,      /*80 OFF档界面显示*/
+    _MN_DSP_Menu_OFF,       /* 80 */
+    _MN_DSP_Menu_Test,      /* 81 */
 
     /*工厂模式*/
     _FAC_DSP_LEVEL1MENU_1, /* 80 DTC显示*/
@@ -142,7 +143,7 @@ typedef enum
     _FAC_DSP_LEVEL2_1MENU_4, /* 94 仪表故障*/
 
     /*经销商模式*/
-    //_DIS_
+    _DIS_DSP_LEVEL1MENU_1,
     //
     //
     _MN_DSP_MENU_MAX,
@@ -168,13 +169,18 @@ typedef struct
     uint8_t Menu_Time_Flag;         /*从Enter界面确认退出计时*/
     uint8_t Menu_Enter_Return;      /*进入Enter之前界面*/
     uint8_t Menu_Return;            /*Enter Return界面切换标记*/
-    uint16_t Key_Menu_Popup_time; /*上述状态持续时间*/
+    uint16_t Key_Menu_Popup_time;   /*报警状态持续时间*/
     uint8_t Menu_Key_Time;          /*按键长按时间记录*/
     uint8_t Key_Menu_Popup_Flag;    /*报警界面menu按键长按 */
-    uint8_t Menu_Light_Time;
-    uint8_t Menu_Light_Time_Flag;
-    uint8_t Menu_Popup_Flag;
-    uint8_t MenuNum;
+    uint8_t Menu_Popup_Flag;        /*界面状态 0-通常 1-报警 2-工厂 3-经销商*/
+    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 Reserve1;
+
 } _MenuFlag;
 
 EXTERN_MEU_PROCESS _MenuFlag MenuFlag;
@@ -523,6 +529,10 @@ EXTERN_MEU_PROCESS void LevelMenuOFF_Enter(void);
 EXTERN_MEU_PROCESS void LevelMenuOFF_Do(void);
 EXTERN_MEU_PROCESS void LevelMenuOFF_Exit(void);
 
+EXTERN_MEU_PROCESS void LevelMenuTest_Enter(void);
+EXTERN_MEU_PROCESS void LevelMenuTest_Do(void);
+EXTERN_MEU_PROCESS void LevelMenuTest_Exit(void);
+
 EXTERN_MEU_PROCESS void LevelF1Menu_1Enter(void);
 EXTERN_MEU_PROCESS void LevelF1Menu_1Do(void);
 EXTERN_MEU_PROCESS void LevelF1Menu_1Exit(void);

source/Application/Graphic/Menu/Menu_user.c

 
 #define   GLOBALS_MEU_PROCESS
+
 #include "Menu.h"
 #include "GUI.h"
 #include "Services_Mileage.h"
@@ -120,6 +121,7 @@ const _MenuOptTab   MenuOptTab[] =
     /*79*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_DSP_LEVEL2_5_MENU_4,  Level3_5Menu_4Enter,     Level3_5Menu_4Do,     Level3_5Menu_4Exit},
 
     /*80*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelMenuOFF_Enter,      LevelMenuOFF_Do,      LevelMenuOFF_Exit},
+    /*81*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             LevelMenuTest_Enter,     LevelMenuTest_Do,     LevelMenuTest_Exit},
 
     /*工厂模式*/
     /*80*/{ _FAC_DSP_LEVEL1_1MENU_1,  _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    _MN_IDX_NULL,             LevelF1Menu_1Enter,      LevelF1Menu_1Do,      LevelF1Menu_1Exit},
@@ -1602,6 +1604,17 @@ void LevelMenuOFF_Do(void)
 void LevelMenuOFF_Exit(void)
 {}
 
+/*自检*/
+void LevelMenuTest_Enter(void)
+{}
+void LevelMenuTest_Do(void)
+{
+    GUI_OftenShowOFF_Display();
+    GUI_Test_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelMenuTest_Exit(void)
+{}
+
 /*----工厂模式----*/
 /*----工厂模式----DTC显示-----*/
 void LevelF1Menu_1Enter(void)

source/Application/Graphic/UE/DisplaySch_user.c

@@ -147,6 +147,71 @@ void DisplayServices(void)
         {
             ; /*Do Nothing!*/
         }
+
+        /*工厂模式*/
+        if (MenuFlag.Menu_Popup_Flag == 2u)
+        {
+            if (0)
+            {
+                MenuFlag.Menu_Popup_Flag = 1u;
+            }
+            else if (0)
+            {
+                MenuFlag.Menu_Dealer = 1u;
+            }
+            else if (0)
+            {
+                MenuFlag.Menu_Test = 1u;
+            }
+            else
+            {
+                ;/*Do Nothing!*/
+            }
+        }
+        /*经销商模式*/
+        else if (MenuFlag.Menu_Popup_Flag == 3u)
+        {
+            if (0)
+            {
+                MenuFlag.Menu_Popup_Flag = 1u;
+            }
+            else if (0)
+            {
+                MenuFlag.Menu_Factory = 1u;
+            }
+            else if (0)
+            {
+                enuFlag.Menu_Test = 1u;
+            }
+            else
+            {
+                ;/*Do Nothing!*/
+            }
+        }
+        /*自检模式*/
+        else if (MenuFlag.Menu_Popup_Flag == 4u)
+        {
+            if (0)
+            {
+                MenuFlag.Menu_Popup_Flag = 1u;
+            }
+            else if (0)
+            {
+                MenuFlag.Menu_Factory = 1u;
+            }
+            else if (0)
+            {
+                MenuFlag.Menu_Dealer = 1u;
+            }
+            else
+            {
+                ;/*Do Nothing!*/
+            }
+        }
+        else
+        {
+            ;/*Do Nothing!*/
+        }
     }
 
     DispSch_xxxMs_Logic(10u);
@@ -317,8 +382,30 @@ void GUI_DisplayServices(void)
             if (MenuFlag.Menu_Popup_Flag == 1u)
             {
                 MenuFlag.Menu_Popup_Flag = 0u;
+
                 NextMenu( MenuFlag.MenuNum );
             }
+            else if (MenuFlag.Menu_Factory == 1u)
+            {
+                MenuFlag.Menu_Factory = 0u;
+                MenuFlag.Menu_Popup_Flag = 2u;
+
+                NextMenu( _FAC_DSP_LEVEL1MENU_1 );
+            }
+            else if (MenuFlag.Menu_Dealer == 1u)
+            {
+                MenuFlag.Menu_Dealer = 0u;
+                MenuFlag.Menu_Popup_Flag = 3u;
+
+                NextMenu( _DIS_DSP_LEVEL1MENU_1 );
+            }
+            else if (MenuFlag.Menu_Test == 1u)
+            {
+                MenuFlag.Menu_Test = 0;
+                MenuFlag.Menu_Popup_Flag = 4u;
+
+                NextMenu( _MN_DSP_Menu_Test );
+            }
 
             if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
                     (bCurMenuIDX >= _FAC_DSP_LEVEL1MENU_1))

source/System/tasks.c

@@ -141,8 +141,16 @@ void Sys_Run_Mode_10ms_Tasks(void)
     Line_In_Debounce_Service();
     Popup_Alone_Sound_Server();
     Telltales_Left_Right_Management_Service();
+
+    if (MenuFlag.Menu_Popup_Flag == 4u)
+    {
+        Test_LED_AllLight();
+    }
+    else
+    {
         Telltales_Management();
-    //Test_LED_AllLight();
+    }
+
     Key_Service();
     CAN_BUSOFF_Recover();