Commit 8a5f3d2d authored by hu's avatar hu

调整OFF档发动机时间5分钟之内可以任意触发次数,5分钟后休眠

parent f015d5c5
...@@ -103,7 +103,7 @@ void BL_Management_service(void) ...@@ -103,7 +103,7 @@ void BL_Management_service(void)
Get_Menu_Off_Time = Coom_Get_Menu_Off_Time(); Get_Menu_Off_Time = Coom_Get_Menu_Off_Time();
//if (BackLightOFF_TIME < 3000) //if (BackLightOFF_TIME < 3000)
if ((State_Flag.Menu_Key_Static == 1u) && (Get_Menu_Off_Time < 7550)) if ((State_Flag.Menu_Key_Static == 1u) && (Coom_Get_Menu_Off_MenuTime() < 7500))
{ {
BackLightOFF_TIME++; BackLightOFF_TIME++;
......
...@@ -1581,6 +1581,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent) ...@@ -1581,6 +1581,7 @@ void Key_Operation_ODOTrip(Key_Event_en_t enKeyEvent)
else else
{ {
State_Flag.Menu_Key_Static = 1u; State_Flag.Menu_Key_Static = 1u;
Coom_Set_Menu_Off_MenuTime(0);
} }
} }
else if (enKeyEvent == KEY_EVENT_LONG_PRESS_1) else if (enKeyEvent == KEY_EVENT_LONG_PRESS_1)
......
...@@ -331,7 +331,7 @@ Power_Status_t Power_Stay_OFF(void) ...@@ -331,7 +331,7 @@ Power_Status_t Power_Stay_OFF(void)
if ( if (
(PowerGetNMStatus() == POWER_NM_SLEEP) && (PowerGetNMStatus() == POWER_NM_SLEEP) &&
(LED_WAKEUP == LEVEL_LOW) && (LED_WAKEUP == LEVEL_LOW) &&
(Get_Menu_Off_Time >= 7600u) (Get_Menu_Off_Time >= 150050)
) )
{ {
u8PowerSts = m_IGN_Sleep_Init; u8PowerSts = m_IGN_Sleep_Init;
......
...@@ -2036,7 +2036,7 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode) ...@@ -2036,7 +2036,7 @@ void GUI_Time_OilTemp_OFF_Display(uint8_t Mode)
Get_Menu_Off_Time = Coom_Get_Menu_Off_Time(); Get_Menu_Off_Time = Coom_Get_Menu_Off_Time();
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))
{ {
/*时间*/ /*时间*/
GUI_General_Display(MENU_Sprite, CN_Time_wenzi, GUI_BLENDMODE_SRC_OVER); /*时间*/ GUI_General_Display(MENU_Sprite, CN_Time_wenzi, GUI_BLENDMODE_SRC_OVER); /*时间*/
......
...@@ -96,6 +96,7 @@ uint32_t Can_Engine_Oil_Num ; ...@@ -96,6 +96,7 @@ uint32_t Can_Engine_Oil_Num ;
#pragma ghs section bss=".myNonInitArea" #pragma ghs section bss=".myNonInitArea"
static uint32_t Menu_Off_Time; static uint32_t Menu_Off_Time;
static uint32_t Menu_Off_MenuTime;
#pragma ghs section bss=default #pragma ghs section bss=default
/*每次唤醒调用*/ /*每次唤醒调用*/
...@@ -586,6 +587,7 @@ void Common_Input_Para(void) ...@@ -586,6 +587,7 @@ void Common_Input_Para(void)
} }
Menu_Off_Time = 0u; Menu_Off_Time = 0u;
Menu_Off_MenuTime = 0;
} }
else else
{ {
...@@ -600,6 +602,11 @@ void Common_Input_Para(void) ...@@ -600,6 +602,11 @@ void Common_Input_Para(void)
{ {
Menu_Off_Time ++; Menu_Off_Time ++;
} }
if (Menu_Off_MenuTime <= 300000u)
{
Menu_Off_MenuTime++;
}
Common_Set_IG_Sts(COMMON_POWER_OFF); Common_Set_IG_Sts(COMMON_POWER_OFF);
Common_Set_IG_Sts_Valid(COMMON_Valid); Common_Set_IG_Sts_Valid(COMMON_Valid);
...@@ -925,6 +932,15 @@ uint32_t Coom_Get_Menu_Off_Time(void) ...@@ -925,6 +932,15 @@ uint32_t Coom_Get_Menu_Off_Time(void)
return Menu_Off_Time; 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) void Common_Set_18EF1718_Msg_Sta(void)
{ {
Set_18EF1718_Msg_Sta = COMMON_Valid; Set_18EF1718_Msg_Sta = COMMON_Valid;
......
...@@ -56,6 +56,8 @@ void Common_Set_Menu_FacDea_Time_Sta(uint32_t Value); ...@@ -56,6 +56,8 @@ void Common_Set_Menu_FacDea_Time_Sta(uint32_t Value);
uint32_t Common_Get_Menu_FacDea_Time_Sta(void); uint32_t Common_Get_Menu_FacDea_Time_Sta(void);
uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void); uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void);
uint32_t Coom_Get_Menu_Off_Time(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); void Common_Set_18EF1718_Msg_Sta(void);
DataValid_t Common_Get_18EF1718_Msg_Sta(void); DataValid_t Common_Get_18EF1718_Msg_Sta(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment