调整仪表参数显示状态

source/Application/APP/Telltales/Telltales_user.c

@@ -650,7 +650,7 @@ void LED_H_S_A_T_Execution(uint8_t led_status)
 /******************************************************************************
   T11 RETARDER
   信号接口： 0x18FF5510 Byte:1,bit:1==01(B) 绿    ----  0x18FF5510  Byte1,Bit1 Byte:1,bit:1==10(B)  黄闪
-  信号定义：
+  信号定义： 2022-02-09 取消EOL配置条件
   输出信号：
  ******************************************************************************/
 uint8_t LED_RETARDER_T_Judgement(void)
@@ -660,20 +660,13 @@ uint8_t LED_RETARDER_T_Judgement(void)
 
     m_Condition1 = (uint8_t)Get_ID_18FF5510_Sig_Intarder_Pilot_Lamp_State();
 
-    if (K_Line_Set.K_Line_LID41 == 0x13u)
+    if (m_Condition1 == 2u)
     {
-        if (m_Condition1 == 2u)
-        {
-            u8Result = FLASH_SYNC_1Hz;
-        }
-        else if (m_Condition1 == 1u)
-        {
-            u8Result = 2u;
-        }
+        u8Result = FLASH_SYNC_1Hz;
     }
-    else
+    else if (m_Condition1 == 1u)
     {
-        u8Result = 0u;
+        u8Result = 2u;
     }
 
     return u8Result;
@@ -681,37 +674,28 @@ uint8_t LED_RETARDER_T_Judgement(void)
 
 void LED_RETARDER_T_Execution(uint8_t led_status)
 {
-    if (K_Line_Set.K_Line_LID41 == 0x13u)
+    if (led_status == 1u)
     {
-        if (led_status == 1u)
-        {
-            IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
-            IS31_CHIP0_CHANNEL26 = 0xFFu;//LED_BRIGHTNESSY; /* 黄灯 亮 闪 */
-        }
-        else if (led_status == 2u)
-        {
-            IS31_CHIP0_CHANNEL27 = LED_BRIGHTNESSG; /* 绿灯 亮 */
-            IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
-        }
-        else
-        {
-            IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
-            IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
-        }
+        IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
+        IS31_CHIP0_CHANNEL26 = 0xFFu;//LED_BRIGHTNESSY; /* 黄灯 亮 闪 */
+    }
+    else if (led_status == 2u)
+    {
+        IS31_CHIP0_CHANNEL27 = LED_BRIGHTNESSG; /* 绿灯 亮 */
+        IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
+    }
+    else
+    {
+        IS31_CHIP0_CHANNEL27 = 0x00u; /* 绿灯 灭 */
+        IS31_CHIP0_CHANNEL26 = 0x00u; /* 黄灯 灭 */
+    }
 
-        if (led_status != 0x00u)
-        {
-            SEG_LED_RETARDER_T(7);
-        }
-        else
-        {
-            SEG_LED_RETARDER_T(0);
-        }
+    if (led_status != 0x00u)
+    {
+        SEG_LED_RETARDER_T(7);
     }
     else
     {
-        IS31_CHIP0_CHANNEL27 = 0x00; // 绿灯 灭
-        IS31_CHIP0_CHANNEL26 = 0x00; // 黄灯 灭
         SEG_LED_RETARDER_T(0);
     }
 }

source/Application/Graphic/GUI/GUI.h

@@ -239,6 +239,10 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
 static const uint32_t GUIWedk[7u] = {CN_xingqiri, CN_xingqiyi, CN_xingqier, CN_xingqisan, CN_xingqisi, CN_xingqiwu, CN_xingqiliu};
 static const uint32_t GUIMenuWedk[7u] = {CN_ri, CN_Mon, CN_Tue, CN_Wed, CN_Thu, CN_Fri, CN_Sat};
 static const uint32_t GUIGear[12u] = {CN_dangwei_1, CN_dangwei_2, CN_dangwei_3, CN_dangwei_4, CN_dangwei_5, CN_dangwei_6, CN_dangwei_7, CN_dangwei_8, CN_dangwei_9, CN_dangwei_10, CN_dangwei_11, CN_dangwei_12};
+static const uint32_t GUIMETERY[5] = {Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, CN_Fty_Menu2_08_A};
+static const uint32_t GUIMETERYNUM[16] = {Nb_15_0, Nb_15_1, Nb_15_2, Nb_15_3, Nb_15_4, Nb_15_5, Nb_15_6, Nb_15_7,
+                                          Nb_15_8, Nb_15_9, CN_Fty_Menu2_08_A, CN_Fty_Menu2_08_B, CN_Fty_Menu2_08_C, CN_Fty_Menu2_08_D, CN_Fty_Menu2_08_E, CN_Fty_Menu2_08_F
+                                         };
 
 static const uint16_t GUI_DISP_LEMPY[4] = {92u, 158u, 225u, 291u};
 static const uint16_t GUI_DISP_AC_TEMP[2] = {229u, 216u}; /*室外温度数字显示*/
@@ -416,9 +420,16 @@ 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_DisMenu_Display(uint8_t Mode);              /*经销商模式*/
+void GUI_BG_DisMenu1_Display(uint8_t Mode);             /**/
+void GUI_BG_DisMenu2_Display(uint8_t Mode);             /**/
+void GUI_BG_DisMenu3_Display(uint8_t Mode);             /**/
+void GUI_BG_DisMenu4_Display(uint8_t Mode);             /**/
+void GUI_BG_DisMenu5_Display(uint8_t Mode);             /**/
+void GUI_BG_DisMenu6_Display(uint8_t Mode);             /**/
+void GUI_BG_DisDTCClear_Display(uint8_t Mode);          /*经销商模式清除DTC1*/
+void GUI_BG_DisDTCClearYN_Display(uint8_t Mode);        /*经销商模式清除DTC2*/
+void GUI_BG_DisMeter_Display(uint8_t Mode);             /*经销商模式仪表显示*/
 
 void GUI_BG_DTCEngine_Display(uint8_t Mode);            /*发动机故障*/
 void GUI_BG_DTCSCR_Display(uint8_t Mode);               /*SCR故障*/
@@ -427,6 +438,7 @@ 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);
+void K_LINE_EOL_Val_Server(void);
 
 /*-----报警--------------------------------------------------------*/
 void GUI_General_Popup(void);

source/Application/Graphic/Menu/Menu.h

@@ -143,9 +143,33 @@ typedef enum
     _FAC_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/
 
     /*经销商模式*/
-    _DIS_DSP_LEVEL1MENU_1,
-    //
-    //
+    _DIS_DSP_LEVEL1MENU_1, /* 82 DTC显示*/
+    _DIS_DSP_LEVEL1MENU_2, /* 83 DTC清除*/
+    _DIS_DSP_LEVEL1MENU_3, /* 84 仪表设定显示*/
+    _DIS_DSP_LEVEL1MENU_4, /* 85 暂时通常模式*/
+    _DIS_DSP_LEVEL1MENU_5, /* 86 结束经销商模式*/
+    _DIS_DSP_LEVEL1MENU_6, /* 87 HID自动水平初始化*/
+
+    _DIS_DSP_LEVEL1_1MENU_1, /* 88 故障码读取中*/
+
+    _DIS_DSP_LEVEL1_2MENU_1, /* 89 清除所有DTC*/
+    _DIS_DSP_LEVEL1_2MENU_2, /* 90 清除所有DTC*/
+
+    _DIS_DSP_LEVEL1_3MENU_1, /* 91 L0-7 H2-A*/
+    _DIS_DSP_LEVEL1_3MENU_2, /* 92 L8-F H2-A*/
+
+    _DIS_DSP_LEVEL2_1MENU_1, /* 93 发动机故障*/
+    _DIS_DSP_LEVEL2_1MENU_2, /* 94 SCR系统故障*/
+    _DIS_DSP_LEVEL2_1MENU_3, /* 95 EBS/ABS故障*/
+    _DIS_DSP_LEVEL2_1MENU_4, /* 96 仪表故障*/
+
+
+
+
+
+
+
+
     _MN_DSP_MENU_MAX,
 
 } _MenuCode;
@@ -192,7 +216,7 @@ EXTERN_MEU_PROCESS uint8_t bCurMenuIDX;  // the current index of menu.
 EXTERN_MEU_PROCESS uint8_t bMainMenuIDX; // the current index of menu.
 EXTERN_MEU_PROCESS uint8_t bOldMenuIDX;  // the Old index of menu.
 
-EXTERN_MEU_PROCESS const _MenuOptTab MenuOptTab[]; // add
+EXTERN_MEU_PROCESS const _MenuOptTab MenuOptTab[];
 EXTERN_MEU_PROCESS void NextMenu(_MENU_IDX idx);
 EXTERN_MEU_PROCESS void MenuInit(void);
 EXTERN_MEU_PROCESS void MenuManage(void);
@@ -533,6 +557,7 @@ 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);
@@ -589,4 +614,29 @@ EXTERN_MEU_PROCESS void LevelF1_1Menu_4Enter(void);
 EXTERN_MEU_PROCESS void LevelF1_1Menu_4Do(void);
 EXTERN_MEU_PROCESS void LevelF1_1Menu_4Exit(void);
 
+/*经销商模式*/
+EXTERN_MEU_PROCESS void LevelD1Menu_1Enter(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_1Do(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_1Exit(void);
+
+EXTERN_MEU_PROCESS void LevelD1Menu_2Enter(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_2Do(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_2Exit(void);
+
+EXTERN_MEU_PROCESS void LevelD1Menu_3Enter(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_3Do(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_3Exit(void);
+
+EXTERN_MEU_PROCESS void LevelD1Menu_4Enter(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_4Do(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_4Exit(void);
+
+EXTERN_MEU_PROCESS void LevelD1Menu_5Enter(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_5Do(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_5Exit(void);
+
+EXTERN_MEU_PROCESS void LevelD1Menu_6Enter(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_6Do(void);
+EXTERN_MEU_PROCESS void LevelD1Menu_6Exit(void);
+
 #endif

source/Application/Graphic/Menu/Menu_user.c

@@ -144,6 +144,14 @@ const _MenuOptTab   MenuOptTab[] =
     /*95*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_1,    LevelF1_1Menu_3Enter,    LevelF1_1Menu_3Do,    LevelF1_1Menu_3Exit},
     /*96*/{ _MN_IDX_NULL,             _MN_IDX_NULL,             _MN_IDX_NULL,             _FAC_DSP_LEVEL1MENU_1,    LevelF1_1Menu_4Enter,    LevelF1_1Menu_4Do,    LevelF1_1Menu_4Exit},
 
+    /*经销商模式*/
+    /*82*/{ _DIS_DSP_LEVEL1_1MENU_1,  _MN_IDX_NULL,             _DIS_DSP_LEVEL1MENU_2,    _MN_IDX_NULL,             LevelD1Menu_1Enter,      LevelD1Menu_1Do,      LevelD1Menu_1Exit},
+    /*83*/{ _DIS_DSP_LEVEL1MENU_2,    _DIS_DSP_LEVEL1MENU_1,    _DIS_DSP_LEVEL1MENU_3,    _MN_IDX_NULL,             LevelD1Menu_2Enter,      LevelD1Menu_2Do,      LevelD1Menu_2Exit},
+    /*84*/{ _DIS_DSP_LEVEL1_3MENU_1,  _DIS_DSP_LEVEL1MENU_2,    _DIS_DSP_LEVEL1MENU_4,    _MN_IDX_NULL,             LevelD1Menu_3Enter,      LevelD1Menu_3Do,      LevelD1Menu_3Exit},
+    /*85*/{ _MN_IDX_NULL,             _DIS_DSP_LEVEL1MENU_3,    _DIS_DSP_LEVEL1MENU_5,    _MN_IDX_NULL,             LevelD1Menu_4Enter,      LevelD1Menu_4Do,      LevelD1Menu_4Exit},
+    /*86*/{ _MN_IDX_NULL,             _DIS_DSP_LEVEL1MENU_4,    _DIS_DSP_LEVEL1MENU_6,    _MN_IDX_NULL,             LevelD1Menu_5Enter,      LevelD1Menu_5Do,      LevelD1Menu_5Exit},
+    /*87*/{ _MN_IDX_NULL,             _DIS_DSP_LEVEL1MENU_5,    _MN_IDX_NULL,             _MN_IDX_NULL,             LevelD1Menu_6Enter,      LevelD1Menu_6Do,      LevelD1Menu_6Exit},
+
 };
 void NextMenu(_MENU_IDX idx)
 {
@@ -1771,6 +1779,80 @@ void LevelF1_3Menu_2Enter(void)
 void LevelF1_3Menu_2Do(void)
 {
     GUI_OftenShow_Display();
+    GUI_BG_FacMeter_Display(GUI_DISP_MODE_NORMAL);
 }
 void LevelF1_3Menu_2Exit(void)
+{}
+
+/*经销商模式*/
+/*----经销商模式----DTC显示----*/
+void LevelD1Menu_1Enter(void)
+{}
+void LevelD1Menu_1Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_DisMenu1_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelD1Menu_1Exit(void)
+{}
+
+/*----经销商模式----DTC清除----*/
+void LevelD1Menu_2Enter(void)
+{}
+void LevelD1Menu_2Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_DisMenu2_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelD1Menu_2Exit(void)
+{}
+
+/*----经销商模式----仪表设定显示----*/
+void LevelD1Menu_3Enter(void)
+{}
+void LevelD1Menu_3Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_DisMenu3_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelD1Menu_3Exit(void)
+{}
+
+/*----经销商模式----一般，通常模式显示----*/
+void LevelD1Menu_4Enter(void)
+{}
+void LevelD1Menu_4Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_DisMenu4_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelD1Menu_4Exit(void)
+{}
+
+/*----经销商模式----经销商模式结束----*/
+void LevelD1Menu_5Enter(void)
+{}
+void LevelD1Menu_5Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_DisMenu5_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelD1Menu_5Exit(void)
+{}
+
+/*----经销商模式----HID自动水平初始化----*/
+void LevelD1Menu_6Enter(void)
+{}
+void LevelD1Menu_6Do(void)
+{
+    GUI_OftenShow_Display();
+    GUI_BG_DisMenu_Display(GUI_DISP_MODE_NORMAL);
+    GUI_BG_DisMenu6_Display(GUI_DISP_MODE_NORMAL);
+}
+void LevelD1Menu_6Exit(void)
 {}
\ No newline at end of file

source/Application/RTE/Common_Interface.c

@@ -854,7 +854,7 @@ void K_LINE_EOL_InitVal(void)
     K_Line_Set.K_Line_LID3B = 0x00u; /* -- 预留 */
     K_Line_Set.K_Line_LID3C = 0x00u; /* -- 预留 */
     K_Line_Set.K_Line_LID3D = 0x00u; /* -- 预留 */
-    K_Line_Set.K_Line_LID3E = 0x01u; /* 01 预留             //0：胎压功能未匹配    1：匹配 */
+    K_Line_Set.K_Line_LID3E = 0x01u; /* 01 胎压匹配功能      //0：胎压功能未匹配    1：匹配 */
     K_Line_Set.K_Line_LID3F = 0x00u; /* -- 预留 */
     K_Line_Set.K_Line_LID40 = 0x00u; /* 00 发动机种类 */
     K_Line_Set.K_Line_LID41 = 0x13u; /* 50 变速器种类＆控制                                /*初值50*/
@@ -878,4 +878,4 @@ void K_LINE_EOL_InitVal(void)
 
     K_Line_Set.ReservedB = 0x0A;
     K_Line_Set.ReservedC = 0x0A;
-}
+}
\ No newline at end of file