调整图片

source/Application/Graphic/GUI/GUI.c

@@ -6516,6 +6516,7 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode)
         GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
     }
 }
+
 /*--------------------------------------------------------------------------
  * Function Name  : GUI_BG_DTCSCR_Display
  * Description    :
@@ -6544,7 +6545,9 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode)
     {
         GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
     }
-}/*--------------------------------------------------------------------------
+}
+
+/*--------------------------------------------------------------------------
  * Function Name  : GUI_BG_FacMenu6_Display
  * Description    :
  * Input          : None
@@ -6572,4 +6575,106 @@ void GUI_BG_DTCAMT_Display(uint8_t Mode)
     {
         GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
     }
+}
+
+/*--------------------------------------------------------------------------
+ * Function Name  : GUI_BG_FacDTCClear_Display
+ * Description    :
+ * Input          : None
+ * Output         : None
+ * Return         : None
+ * onther         : 区域
+ --------------------------------------------------------------------------*/
+void GUI_BG_FacDTCClear_Display(uint8_t Mode)
+{
+    if (Mode == GUI_DISP_MODE_NORMAL)
+    {
+        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
+
+        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_1, GUI_BLENDMODE_SRC_OVER);
+    }
+    else
+    {
+        GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+    }
+}
+
+/*--------------------------------------------------------------------------
+ * Function Name  : GUI_BG_FacMenu6_Display
+ * Description    :
+ * Input          : None
+ * Output         : None
+ * Return         : None
+ * onther         : 区域
+ --------------------------------------------------------------------------*/
+void GUI_BG_FacDTCClearYN_Display(uint8_t Mode)
+{
+    if (Mode == GUI_DISP_MODE_NORMAL)
+    {
+        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
+        GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER);           /*line*/
+
+        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_02_2, GUI_BLENDMODE_SRC_OVER);
+    }
+    else
+    {
+        GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+    }
+}
+
+/*--------------------------------------------------------------------------
+ * Function Name  : GUI_BG_FacMeter_Display
+ * Description    :
+ * Input          : None
+ * Output         : None
+ * Return         : None
+ * onther         : 区域
+ --------------------------------------------------------------------------*/
+void GUI_BG_FacMeter_Display(uint8_t Mode)
+{
+    uint8_t i = 0u;
+    uint8_t j = 0u;
+
+    if (Mode == GUI_DISP_MODE_NORMAL)
+    {
+        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_08_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);         /*长度条*/
+
+        GUI_General_Display(MENU_Sprite, CN_Fty_Menu2_08_biaoge, GUI_BLENDMODE_SRC_OVER);/*框*/
+        GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_L, 286u, 164u, GUI_BLENDMODE_SRC_OVER);/*L*/
+        GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_H, 260u, 178u, GUI_BLENDMODE_SRC_OVER);/*H*/
+
+        /*标题*/
+        for (i = 0; i < 9; i++)
+        {
+            if (i == 0)
+            {
+                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*/
+                }
+            }
+            else
+            {
+                GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_M + i, (270u + 43u * i), 168u, GUI_BLENDMODE_SRC_OVER); /*M*/
+            }
+        }
+
+        /*数字*/
+        for (i = 0; i < 8; i++)
+        {
+            for (j = 0; j < 5; j++)
+            {
+                GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_O, (302u + 44u * i), (208u + 40u * j), GUI_BLENDMODE_SRC_OVER); /*M*/
+                GUI_Translate_Display(MENU_Sprite, CN_Fty_Menu2_08_O, (320u + 44u * i), (208u + 40u * j), GUI_BLENDMODE_SRC_OVER); /*M*/
+            }
+        }
+
+    }
+    else
+    {
+        GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+    }
 }
\ No newline at end of file

source/Application/Graphic/GUI/GUI.h

@@ -410,6 +410,13 @@ void GUI_BG_FacMenu3_Display(uint8_t Mode);             /**/
 void GUI_BG_FacMenu4_Display(uint8_t Mode);             /**/
 void GUI_BG_FacMenu5_Display(uint8_t Mode);             /**/
 void GUI_BG_FacMenu6_Display(uint8_t Mode);             /**/
+void GUI_BG_FacDTCClear_Display(uint8_t Mode);          /*工厂模式清除DTC1*/
+void GUI_BG_FacDTCClearYN_Display(uint8_t Mode);        /*工厂模式清除DTC2*/
+void GUI_BG_FacMeter_Display(uint8_t Mode);             /*工厂模式仪表显示*/
+
+
+
+
 void GUI_BG_DTCEngine_Display(uint8_t Mode);            /*发动机故障*/
 void GUI_BG_DTCSCR_Display(uint8_t Mode);               /*SCR故障*/
 void GUI_BG_DTCAMT_Display(uint8_t Mode);               /*AMT故障*/

source/Application/Graphic/Menu/Menu.h

@@ -539,6 +539,22 @@ EXTERN_MEU_PROCESS void LevelF1Menu_6Enter(void);
 EXTERN_MEU_PROCESS void LevelF1Menu_6Do(void);
 EXTERN_MEU_PROCESS void LevelF1Menu_6Exit(void);
 
+EXTERN_MEU_PROCESS void LevelF1_2Menu_1Enter(void);
+EXTERN_MEU_PROCESS void LevelF1_2Menu_1Do(void);
+EXTERN_MEU_PROCESS void LevelF1_2Menu_1Exit(void);
+
+EXTERN_MEU_PROCESS void LevelF1_2Menu_2Enter(void);
+EXTERN_MEU_PROCESS void LevelF1_2Menu_2Do(void);
+EXTERN_MEU_PROCESS void LevelF1_2Menu_2Exit(void);
+
+EXTERN_MEU_PROCESS void LevelF1_3Menu_1Enter(void);
+EXTERN_MEU_PROCESS void LevelF1_3Menu_1Do(void);
+EXTERN_MEU_PROCESS void LevelF1_3Menu_1Exit(void);
+
+EXTERN_MEU_PROCESS void LevelF1_3Menu_2Enter(void);
+EXTERN_MEU_PROCESS void LevelF1_3Menu_2Do(void);
+EXTERN_MEU_PROCESS void LevelF1_3Menu_2Exit(void);
+
 EXTERN_MEU_PROCESS void LevelF1_1Menu_1Enter(void);
 EXTERN_MEU_PROCESS void LevelF1_1Menu_1Do(void);
 EXTERN_MEU_PROCESS void LevelF1_1Menu_1Exit(void);

source/Application/Graphic/Menu/Menu_user.c

@@ -129,11 +129,11 @@ const _MenuOptTab   MenuOptTab[] =
 
     /*86*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_1,    LevelF1_1Menu_1Enter,    LevelF1_1Menu_1Do,    LevelF1_1Menu_1Exit},
 
-    /*87*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    Level3_5Menu_4Enter,     Level3_5Menu_4Do,     Level3_5Menu_4Exit},
-    /*88*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    Level3_5Menu_4Enter,     Level3_5Menu_4Do,     Level3_5Menu_4Exit},
+    /*87*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    LevelF1_2Menu_1Enter,    LevelF1_2Menu_1Do,    LevelF1_2Menu_1Exit},
+    /*88*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_2,    LevelF1_2Menu_2Enter,    LevelF1_2Menu_2Do,    LevelF1_2Menu_2Exit},
 
-    /*89*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_3,    Level3_5Menu_4Enter,     Level3_5Menu_4Do,     Level3_5Menu_4Exit},
-    /*90*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_3,    Level3_5Menu_4Enter,     Level3_5Menu_4Do,     Level3_5Menu_4Exit},
+    /*89*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_3,    LevelF1_3Menu_1Enter,    LevelF1_3Menu_1Do,    LevelF1_3Menu_1Exit},
+    /*90*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_3,    LevelF1_3Menu_2Enter,    LevelF1_3Menu_2Do,    LevelF1_3Menu_2Exit},
 
     /*91*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_1,    LevelF1_1Menu_1Enter,    LevelF1_1Menu_1Do,    LevelF1_1Menu_1Exit},
     /*92*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_1,    LevelF1_1Menu_2Enter,    LevelF1_1Menu_2Do,    LevelF1_1Menu_2Exit},
@@ -1705,4 +1705,47 @@ void LevelF1_1Menu_4Do(void)
     GUI_OftenShow_Display();
 }
 void LevelF1_1Menu_4Exit(void)
+{}
+
+/*----工厂模式----DTC清除----所有DTC全部清除-----*/
+void LevelF1_2Menu_1Enter(void)
+{}
+void LevelF1_2Menu_1Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_FacDTCClear_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelF1_2Menu_1Exit(void)
+{}
+
+/*----工厂模式----DTC清除----清除DTC全部-----*/
+void LevelF1_2Menu_2Enter(void)
+{}
+void LevelF1_2Menu_2Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_FacDTCClearYN_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelF1_2Menu_2Exit(void)
+{}
+
+/*----工厂模式----仪表设定显示----L0-7 H2-A-----*/
+void LevelF1_3Menu_1Enter(void)
+{}
+void LevelF1_3Menu_1Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_FacMeter_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelF1_3Menu_1Exit(void)
+{}
+
+/*----工厂模式----仪表设定显示----L8-F H2-A-----*/
+void LevelF1_3Menu_2Enter(void)
+{}
+void LevelF1_3Menu_2Do(void)
+{
+    GUI_OftenShow_Display();
+}
+void LevelF1_3Menu_2Exit(void)
 {}
\ No newline at end of file

source/Driver/Graphic/images.h

@@ -620,6 +620,7 @@ enum SpriteName
     CN_Fty_Menu2_08_A,
     CN_Fty_Menu2_08_B,
     CN_Fty_Menu2_08_biaoge,
+    CN_Fty_Menu2_08_biaoge1,
     CN_Fty_Menu2_08_C,
     CN_Fty_Menu2_08_D,
     CN_Fty_Menu2_08_E,

source/Driver/Graphic/loc_graphics_data.h

@@ -109,7 +109,7 @@ uint8_t             CalendarEn = 0u;
 LogicLayerAttr_t    CalendarLogicLayerAttr[MAX_CALENDAR_SUP_LAYER];
 
 /**/
-#define MAX_MENU_SUP_LAYER        60
+#define MAX_MENU_SUP_LAYER        115
 MultiBufferSprite_t MENUSpriteBuf;
 uint8_t             MENUIndex = 0u;
 uint8_t             MENUUpdate = 0u;