调整三态转换

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -1048,7 +1048,7 @@ void Drive_Info_IC3_STATUS_Rx(void)
 
             User_set_Num.User_Tpms ++;
 
-            if (User_set_Num.User_Tpms == 0x0d)
+            if (User_set_Num.User_Tpms == 0x0Du)
             {
                 User_set_Num.User_TpmsStatus = 0;
             }
@@ -1058,7 +1058,7 @@ void Drive_Info_IC3_STATUS_Rx(void)
             }
         }
     }
-    else  if ((Msg_18021733[0]  == 0xFF) && (Msg_18021733[1]  == 0x06))
+    else  if ((Msg_18021733[0]  == 0xFFu) && (Msg_18021733[1]  == 0x06u))
     {
         TPMS_Matching.FLAG = 0;
 

source/Application/Graphic/GUI/GUI.c

@@ -6096,13 +6096,6 @@ void GUI_BG_Enter_Return_Display(uint8_t Mode)
     }
 }
 
-
-
-
-
-
-
-
 void Common_EOL_User_Server(void)
 {
     /*发动机油*/
@@ -6709,12 +6702,12 @@ void GUI_BG_FacMeter_Display(uint8_t Mode)
             {
                 for (j = 0; j < 4; j++)
                 {
-                    GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_N, (270u + 43u * i), (208u + 40u * j), GUI_BLENDMODE_SRC_OVER); /*M*/
+                    GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu2_08_O + j), (270u + 43u * i), (208u + 40u * j), GUI_BLENDMODE_SRC_OVER); /*M*/
                 }
             }
             else
             {
-                GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_M + i, (270u + 43u * i), 168u, GUI_BLENDMODE_SRC_OVER); /*M*/
+                GUI_Translate_Display(MENU_Sprite, (CN_Fty_Menu2_08_M + i), (270u + 43u * i), 168u, GUI_BLENDMODE_SRC_OVER); /*M*/
             }
         }
 

source/Application/Graphic/Menu/Menu.h

@@ -172,7 +172,7 @@ typedef struct
     uint16_t Key_Menu_Popup_time;   /*报警状态持续时间*/
     uint8_t Menu_Key_Time;          /*按键长按时间记录*/
     uint8_t Key_Menu_Popup_Flag;    /*报警界面menu按键长按 */
-    uint8_t Menu_Popup_Flag;        /*界面状态 0-通常 1-报警 2-工厂 3-经销商*/
+    uint8_t Menu_Popup_Flag;        /*界面状态 0-通常 1-报警 2-工厂 3-经销商 4-仪表自我诊断*/
     uint8_t MenuNum;                /*历史界面保存*/
     uint8_t Key_MenuTest_Long;      /**/
     uint8_t Key_MenuTest_ShortNum;  /**/

source/Application/Graphic/UE/DisplaySch_user.c

@@ -80,11 +80,13 @@ void DisplayServices(void)
     uint8_t PowerStatus;
     uint16_t popupID = 0xFFFFu;
     uint16_t DispVSpeed = 0u;
+    uint16_t DispESpeed = 0u;
 
     PowerStatus = Common_Get_IG_Sts();
     PowerOnTimer = Common_GetIgnOnTime();
     PowerOFFTimer = Common_GetIgnOffTime();
     DispVSpeed = Common_Get_Disp_V_Speed();
+    DispESpeed = Common_Get_Act_E_Speed();
 
     if ((PowerOnTimer <= StartAnimationEnd) && (PowerOnTimer >= StartAnimationStart))
     {
@@ -136,18 +138,6 @@ void DisplayServices(void)
             }
         }
 
-        if (DispVSpeed > 66u)
-        {
-            if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
-            {
-                NextMenu(MenuFlag.Menu_Flag);
-            }
-        }
-        else
-        {
-            ; /*Do Nothing!*/
-        }
-
         /*通常模式*/
         if (MenuFlag.Menu_Popup_Flag == 0u)
         {
@@ -159,34 +149,40 @@ void DisplayServices(void)
                 MenuFlag.Key_MenuTest_Long = 0u;
                 MenuFlag.Key_MenuTest_ShortNum = 0u;
             }
-            else if (0)
+            else if (K_Line_Set.K_Line_LID51 == 0x00u)
             {
                 MenuFlag.Menu_Factory = 1u;
             }
-            else if (0)
+            else if (K_Line_Set.K_Line_LID51 == 0x02u)
             {
                 MenuFlag.Menu_Dealer = 1u;
             }
             else
             {
-                ;/*Do Nothing!*/
+                if (DispVSpeed > 66u)
+                {
+                    if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
+                    {
+                        NextMenu(MenuFlag.Menu_Flag);
+                    }
+                }
+                else
+                {
+                    ; /*Do Nothing!*/
+                }
             }
         }
         /*工厂模式*/
         else if (MenuFlag.Menu_Popup_Flag == 2u)
         {
-            if (0)
+            if (K_Line_Set.K_Line_LID51 == 0x01u)
             {
                 MenuFlag.Menu_Popup_Flag = 1u;
             }
-            else if (0)
+            else if (K_Line_Set.K_Line_LID51 == 0x02u)
             {
                 MenuFlag.Menu_Dealer = 1u;
             }
-            else if (0)
-            {
-                MenuFlag.Menu_Test = 1u;
-            }
             else
             {
                 ;/*Do Nothing!*/
@@ -195,18 +191,14 @@ void DisplayServices(void)
         /*经销商模式*/
         else if (MenuFlag.Menu_Popup_Flag == 3u)
         {
-            if (0)
+            if (K_Line_Set.K_Line_LID51 == 0x01u)
             {
                 MenuFlag.Menu_Popup_Flag = 1u;
             }
-            else if (0)
+            else if (K_Line_Set.K_Line_LID51 == 0x00u)
             {
                 MenuFlag.Menu_Factory = 1u;
             }
-            else if (0)
-            {
-                MenuFlag.Menu_Test = 1u;
-            }
             else
             {
                 ;/*Do Nothing!*/
@@ -215,15 +207,11 @@ void DisplayServices(void)
         /*自检模式*/
         else if (MenuFlag.Menu_Popup_Flag == 4u)
         {
-            if (0)
+            if ((DispVSpeed >= 66u) || (DispESpeed >= 330u))
             {
                 MenuFlag.Menu_Popup_Flag = 1u;
             }
             else if (0)
-            {
-                MenuFlag.Menu_Factory = 1u;
-            }
-            else if (0)
             {
                 MenuFlag.Menu_Dealer = 1u;
             }