Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
TianYing_ty100
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TY
TianYing_ty100
Commits
f10d7cfb
Commit
f10d7cfb
authored
May 30, 2024
by
李俭双
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix:43591,更改重上15电,退出时间设置界面,并且保持上一状态,不应该记忆未保存的时间
parent
df9abfdb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
Key_user.c
Firmware/Source/Component/Key/Key_user.c
+4
-2
PowerManag_user.c
Firmware/Source/Component/PowerManagement/PowerManag_user.c
+1
-1
No files found.
Firmware/Source/Component/Key/Key_user.c
View file @
f10d7cfb
...
...
@@ -247,7 +247,7 @@ void Key_Left_Short_Press(void)
datmax
=
23u
;
datmin
=
0u
;
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
)
{
...
...
@@ -255,7 +255,7 @@ void Key_Left_Short_Press(void)
datmax
=
59u
;
datmin
=
0u
;
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
)
...
...
@@ -315,10 +315,12 @@ void Key_Left_Long_Press(void)
}
else
if
(
PageType
==
Page_Time_Hour
)
{
RTC_SetTime
(
&
counter_val
.
time
);
PageType
=
Page_Time_Minute
;
}
else
if
(
PageType
==
Page_Time_Minute
)
{
RTC_SetTime
(
&
counter_val
.
time
);
PageType
=
Page_Km_Unit
;
}
else
if
(
PageType
==
Page_Km_Unit
)
...
...
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @
f10d7cfb
...
...
@@ -95,7 +95,7 @@ extern uint32_t PowerIgnOffTimeLine;
static
void
Power_Wakeup_Init
(
void
)
{
PowerIgnOffTimeLine
=
0
;
RTE_CLOCK_Select_Start
();
//
RTE_CLOCK_Select_Start();
Simulated_IIC_2_Init
();
Gpio_Init
(
Gpio_WakeUp_Init
);
Can_Init
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment