Merge branch 'development' into withBoot

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) && (Get_Menu_Off_Time < 7550))
         {
             BackLightOFF_TIME++;
 

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 电源使能*/

source/Application/APP/Telltales/Telltales_user.c

@@ -677,7 +677,7 @@ void LED_MIL_T_Execution(uint8_t led_status)
 {
     if (led_status == 1)
     {
-        LED_Driver_Channel_Set(0u, 30u, 0xFFu);
+        LED_Driver_Channel_Set(0u, 30u, LED_BRIGHTNESSY);
         SEG_LED_MIL_T(7);
     }
     else

source/Application/Graphic/GUI/GUI.c

@@ -2036,7 +2036,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) && (Get_Menu_Off_Time < 7500))
         {
             /*时间*/
             GUI_General_Display(MENU_Sprite, CN_Time_wenzi, GUI_BLENDMODE_SRC_OVER);  /*时间*/

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;