调整禅道问题

source/Application/APP/Key/Key_user.c

@@ -245,10 +245,10 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
                 /*语言设置 ----反*/
                 else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
                 {
-                    if (User_set_Num.User_Language > 0u)
-                    {
-                        User_set_Num.User_Language--;
-                    }
+                    //if (User_set_Num.User_Language > 0u)
+                    //{
+                    //    User_set_Num.User_Language--;
+                    //}
                 }
                 /*胎压匹配界面*/
                 else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_5)
@@ -756,8 +756,8 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
                 /*语言设置 ----反*/
                 else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3)
                 {
-                    if (User_set_Num.User_Language < 1)
-                        User_set_Num.User_Language++;
+                    //if (User_set_Num.User_Language < 1)
+                    //    User_set_Num.User_Language++;
                 }
                 /*胎压匹配界面*/
                 else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_5)

source/Application/APP/PowerManagement/PowerManagement.c

@@ -23,10 +23,11 @@ void Power_Management_Service ( void )
 {
     switch ( g_Power_St )
     {
+    case m_IGN_Wakeup:
     case m_IGN_OFF_Init:
         Power_IG_OFF_Init();
         g_Power_St = m_IGN_OFF;
-        break;
+        //break;
     case m_IGN_OFF:
         g_Power_St = Power_Stay_OFF();
         break;
@@ -40,7 +41,7 @@ void Power_Management_Service ( void )
     case m_IGN_ON_Init:
         Power_IG_ON_Init();
         g_Power_St = m_IGN_ON;
-        break;
+        //break;
     case m_IGN_ON:
         g_Power_St = Power_Stay_ON();
         break;

source/Application/Graphic/GUI/GUI.c

@@ -1877,6 +1877,7 @@ void GUI_DPD_Display_Display(uint8_t Mode)
 
             if ((value > 1000u) && (CanFlag != 1))
             {
+                /*----禅道3366----*/
                 if (DPD_Display_Time < 200)
                 {
                     DPD_Display_Time ++;

source/Application/Graphic/GUI/GUI.h

@@ -17,7 +17,7 @@
 #define FState_COilTimeOutNum 60u /*3S*/
 
 #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10202)) /*硬件版本号   HV:01.02.02*/
-#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10106))   /*软件版本号   SV:01.01.05*/
+#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10107))   /*软件版本号   SV:01.01.05*/
 #define systemSupplierECUFlashInformationApp ((uint16_t)(14))         /*FLASH版本号 FV:00.14*/
 
 typedef struct

source/Application/K_BUS/kwp2000_service.c

@@ -48,6 +48,7 @@ unsigned long SeedKey = 0;
 unsigned long EOLSeedRandomNumber = 0x727u;
 unsigned char DTCstatusCHGFFK_Line = 0u;
 #pragma ghs section bss=default
+
 /*
 *********************************************************************
 * function
@@ -523,6 +524,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x48: /* 长时间怠速 */
             K_Line_Set.K_Line_LID48 = RequestData[2];
+            User_App.User_IDLING    = K_Line_Set.K_Line_LID48;
             (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x48;
             Tx_Len = 2;
@@ -530,6 +532,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x49: /* 辅助驻车 */
             K_Line_Set.K_Line_LID49 = RequestData[2];
+            User_App.User_Parking   = K_Line_Set.K_Line_LID49
                                       (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x49;
             Tx_Len = 2;
@@ -537,6 +540,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x4A: /* 变速箱油 */
             K_Line_Set.K_Line_LID4A = RequestData[2];
+            User_App.User_BSXY      = (uint32_t)K_Line_Set.K_Line_LID4A * 1000u ;
             (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x4A;
             Tx_Len = 2;
@@ -544,6 +548,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x4B: /* 差速器油 */
             K_Line_Set.K_Line_LID4B = RequestData[2];
+            User_App.User_CSQY      = (uint32_t)K_Line_Set.K_Line_LID4B * 1000u ;
             (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x4B;
             Tx_Len = 2;
@@ -558,6 +563,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x4D: /* 动力转向油 */
             K_Line_Set.K_Line_LID4D = RequestData[2];
+            User_App.User_DLZXY     = (uint32_t)K_Line_Set.K_Line_LID4D * 1000u ;
             (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x4D;
             Tx_Len = 2;
@@ -565,6 +571,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x4E: /* 轮胎 */
             K_Line_Set.K_Line_LID4E = RequestData[2];
+            User_App.User_LT        = (uint32_t)K_Line_Set.K_Line_LID4E * 1000u ;
             (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x4E;
             Tx_Len = 2;
@@ -572,6 +579,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
             break;
         case 0x4F: /* 机油&滤清器 */
             K_Line_Set.K_Line_LID4F = RequestData[2];
+            User_App.User_FDJYLQQ   = (uint32_t)K_Line_Set.K_Line_LID4F * 1000u ;
             (*TxData++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x4F;
             Tx_Len = 2;