Commit f10d7cfb authored by 李俭双's avatar 李俭双

🐞 fix:43591,更改重上15电,退出时间设置界面,并且保持上一状态,不应该记忆未保存的时间

parent df9abfdb
...@@ -247,7 +247,7 @@ void Key_Left_Short_Press(void) ...@@ -247,7 +247,7 @@ void Key_Left_Short_Press(void)
datmax = 23u; datmax = 23u;
datmin = 0u; datmin = 0u;
Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(counter_val.time.RTC_Hours)); Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(counter_val.time.RTC_Hours));
RTC_SetTime(&counter_val.time); //RTC_SetTime(&counter_val.time);
} }
else if(PageType == Page_Time_Minute) else if(PageType == Page_Time_Minute)
{ {
...@@ -255,7 +255,7 @@ void Key_Left_Short_Press(void) ...@@ -255,7 +255,7 @@ void Key_Left_Short_Press(void)
datmax = 59u; datmax = 59u;
datmin = 0u; datmin = 0u;
Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(counter_val.time.RTC_Minutes)); Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(counter_val.time.RTC_Minutes));
RTC_SetTime(&counter_val.time); //RTC_SetTime(&counter_val.time);
} }
else if(PageType == Page_Km_Unit) else if(PageType == Page_Km_Unit)
...@@ -315,10 +315,12 @@ void Key_Left_Long_Press(void) ...@@ -315,10 +315,12 @@ void Key_Left_Long_Press(void)
} }
else if(PageType == Page_Time_Hour) else if(PageType == Page_Time_Hour)
{ {
RTC_SetTime(&counter_val.time);
PageType = Page_Time_Minute; PageType = Page_Time_Minute;
} }
else if(PageType == Page_Time_Minute) else if(PageType == Page_Time_Minute)
{ {
RTC_SetTime(&counter_val.time);
PageType = Page_Km_Unit; PageType = Page_Km_Unit;
} }
else if(PageType == Page_Km_Unit) else if(PageType == Page_Km_Unit)
......
...@@ -95,7 +95,7 @@ extern uint32_t PowerIgnOffTimeLine; ...@@ -95,7 +95,7 @@ extern uint32_t PowerIgnOffTimeLine;
static void Power_Wakeup_Init(void) static void Power_Wakeup_Init(void)
{ {
PowerIgnOffTimeLine = 0; PowerIgnOffTimeLine = 0;
RTE_CLOCK_Select_Start(); //RTE_CLOCK_Select_Start();
Simulated_IIC_2_Init(); Simulated_IIC_2_Init();
Gpio_Init(Gpio_WakeUp_Init); Gpio_Init(Gpio_WakeUp_Init);
Can_Init(); Can_Init();
......
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