Merge branch 'menutest' into withBoot_ENCN

ghs/group/Application.gpj

@@ -100,7 +100,7 @@
 .\APP\Key\Key.h
 .\APP\Key\Key_user.c
 .\APP\Key\Key_user.h
-.\APP\Key\Key_V1.3_1441.a
+.\APP\Key\Key_V1.4_1441.a
 .\APP\LINE_IN\Line_In.c
 .\APP\LINE_IN\Line_In.h
 .\APP\LINE_IN\Line_In_user.h

source/Application/APP/BackLight/BackLight_APP.c

@@ -151,6 +151,7 @@ void BL_Management_service(void)
 
     /*得到热敏电阻电压参数为AD数值*/
     DNC_NumValue = Common_Get_NTCAD();
+
     GetBGLNTCVol((uint16_t)DNC_NumValue);
 
     /*主函数中调用第一个参数电源状态 1是 ON档 2 off 第二个参数 唤醒条件 1是TTF唤醒 2 是表盘唤醒 3 是表盘和屏都有唤醒，0无唤醒*/

source/Application/APP/Key/Key.h

@@ -135,6 +135,9 @@ extern Key_Set_en_t Key_Parameter_Set_Long_Press_2_Time(Key_uint16_t u16Time);
 extern Key_Set_en_t Key_Parameter_Set_Long_Press_3_Time(Key_uint16_t u16Time);
 /*对于消抖按键而言，判断长按4的时间参数。不可小于长按3的时间*/
 extern Key_Set_en_t Key_Parameter_Set_Long_Press_4_Time(Key_uint16_t u16Time);
+/*对于消抖按键而言，判断ON,OFF切换动作的时间参数。
+u16TimeOFF :OFF识别的时间   u16TimeON  :ON识别的时间  */
+extern Key_Set_en_t Key_Parameter_Set_ON_OFF_Time(Key_uint16_t u16TimeOFF, Key_uint16_t u16TimeON);
 /*设置电源状态给按键，单次调用或者多次调用均可*/
 extern void Key_Set_IG_Status(Key_IGN_en_t enIGStatus);
 #endif
\ No newline at end of file

source/Application/APP/Key/Key_user.c

@@ -247,10 +247,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)
@@ -1792,7 +1792,7 @@ Key_Status_en_t Key_Real_Status_Read_Return(void)
     }
     else
     {
-        if ((Key_R >= (7800 - 400)) && (Key_R <= (8900 + 400)))
+        if ((Key_R >= (7800 - 400)) && (Key_R <= (9000 + 600)))
         {
             enKeyRealStatus = KEY_REALTIME_PRESS;
         }

source/Application/Graphic/Menu/Menu_user.c

@@ -1631,8 +1631,14 @@ void Level3_4Menu_3Exit(void)
 {
     if (MenuFlag.Menu_Return)
     {
-        User_App.User_Language    =  User_set_Num.User_Language  ;
-        MenuFlag.Menu_Return = 0;
+    	MenuFlag.Menu_Return = 0;
+        User_App.User_Language    =  User_set_Num.User_Language  ;  
+        K_Line_Set.User_Language  = User_set_Num.User_Language ;
+        Common_Set_DTCstatusCHGFFK_Flag(1);
+    }
+    else
+    {
+        User_set_Num.User_Language   = User_App.User_Language;
     }
 }
 

source/Application/K_BUS/kwp2000_service.c

@@ -533,7 +533,7 @@ unsigned char kwp_writeDataByLocalIdentifier(unsigned char *TxData, unsigned cha
         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++) = KWP2000_WRITEDATABYLOCALIDENTIFIER_REQUEST + KWP2000_POSITIVE_RESPONSE_OFFSET;
             (*TxData++) = 0x49;
             Tx_Len = 2;
             DTCstatusCHGFFK_Line = 1;
@@ -1538,4 +1538,5 @@ void K_LINE_EOL_InitVal(void)
     K_Line_Set.TesterECUCAN = 0x00u; /* 20 */
     K_Line_Set.User_Light1  = 10u;   /*背光亮度等级*/
     K_Line_Set.User_Light2  = 10u;   /*背光亮度等级*/
+    K_Line_Set.User_Language = Language_Cn;
 }

source/Application/K_BUS/kwp2000_service.h

@@ -222,7 +222,7 @@ typedef struct
 
     unsigned char User_Light1;
     unsigned char User_Light2;
-    unsigned char reserve3;
+    unsigned char User_Language;
     unsigned char reserve4;
 } _EOL_K_LINE_SET;