Merge branch 'development' into menutest

source/Application/APP/BackLight/BackLight_APP.c

@@ -103,7 +103,7 @@ void BL_Management_service(void)
         Get_Menu_Off_Time = Coom_Get_Menu_Off_Time();
 
         //if (BackLightOFF_TIME < 3000)
-        if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 7500))
+        if ((State_Flag.Menu_Key_Static == 1u) && (Coom_Get_Menu_Off_MenuTime() < 7500))
         {
             BackLightOFF_TIME++;
 

source/Application/APP/Key/Key_user.c

@@ -1581,6 +1581,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
         else
         {
             State_Flag.Menu_Key_Static = 1u;
+            Coom_Set_Menu_Off_MenuTime(0);
         }
     }
     else if (enKeyEvent == KEY_EVENT_LONG_PRESS_1)

source/Application/APP/PowerManagement/PowerManagement_user.c

@@ -170,8 +170,7 @@ void Power_Sleep_Init(void)
     RSCAN0_CH2_Abort(RSCAN_CHANNEL_BUF_12);
     RSCAN0_CH2_Abort(RSCAN_CHANNEL_BUF_13);
 
-    RSCAN0_CH0_Sleep_Init();
-    RSCAN0_CH2_Sleep_Init();
+    RSCAN0_Sleep_Init();
 
     VCC12V0_OUT_EN = 0u;        /*12V 电源使能*/
     VCC05V0_OUT_EN = 0u;        /*外设5V 电源使能*/
@@ -332,7 +331,7 @@ Power_Status_t Power_Stay_OFF(void)
             if (
                 (PowerGetNMStatus() == POWER_NM_SLEEP) &&
                 (LED_WAKEUP == LEVEL_LOW) &&
-                (Get_Menu_Off_Time >= 7600u)
+                (Get_Menu_Off_Time >= 150050)
             )
             {
                 u8PowerSts = m_IGN_Sleep_Init;

source/Application/Graphic/GUI/GUI.c

@@ -2120,7 +2120,7 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode)
 
         Get_Menu_Off_Time = Coom_Get_Menu_Off_Time();
 
-        if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 150000))
+        if ((State_Flag.Menu_Key_Static == 1u) && (Coom_Get_Menu_Off_MenuTime() < 7500))
         {
             /*时间*/
             if (User_App.User_Language == Language_Cn)

source/Application/Graphic/UE/DisplaySch_user.c

@@ -135,7 +135,7 @@ void DisplayServices(void)
             }
             else
             {
-                if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 7500))
+                if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 7550))
                 {
                     UE_EN[Display_Menu] = UE_Enable;
                     UE_EN[Display_Nothing] = UE_Disable;

source/Application/RTE/Common_Interface.c

@@ -96,6 +96,7 @@ uint32_t Can_Engine_Oil_Num ;
 
 #pragma ghs section bss=".myNonInitArea"
 static uint32_t Menu_Off_Time;
+static uint32_t Menu_Off_MenuTime;
 #pragma ghs section bss=default
 
 /*每次唤醒调用*/
@@ -586,6 +587,7 @@ void Common_Input_Para(void)
         }
 
         Menu_Off_Time = 0u;
+        Menu_Off_MenuTime = 0;
     }
     else
     {
@@ -600,6 +602,11 @@ void Common_Input_Para(void)
         {
             Menu_Off_Time ++;
         }
+
+        if (Menu_Off_MenuTime <= 300000u)
+        {
+            Menu_Off_MenuTime++;
+        }
         Common_Set_IG_Sts(COMMON_POWER_OFF);
         Common_Set_IG_Sts_Valid(COMMON_Valid);
 
@@ -925,6 +932,15 @@ uint32_t Coom_Get_Menu_Off_Time(void)
     return Menu_Off_Time;
 }
 
+void Coom_Set_Menu_Off_MenuTime(uint32_t val)
+{
+    Menu_Off_MenuTime = val;
+}
+
+uint32_t Coom_Get_Menu_Off_MenuTime(void)
+{
+    return Menu_Off_MenuTime;
+}
 void Common_Set_18EF1718_Msg_Sta(void)
 {
     Set_18EF1718_Msg_Sta = COMMON_Valid;

source/Application/RTE/Common_Interface.h

@@ -56,6 +56,8 @@ void Common_Set_Menu_FacDea_Time_Sta(uint32_t Value);
 uint32_t Common_Get_Menu_FacDea_Time_Sta(void);
 uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void);
 uint32_t Coom_Get_Menu_Off_Time(void);
+void Coom_Set_Menu_Off_MenuTime(uint32_t val);
+uint32_t Coom_Get_Menu_Off_MenuTime(void);
 
 void Common_Set_18EF1718_Msg_Sta(void);
 DataValid_t Common_Get_18EF1718_Msg_Sta(void);