libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-21 20:55:26 +08:00
Code Issues Releases Wiki Activity

[rtc.alarm][fix]fix alarm when update datetime

Browse Source
This commit is contained in:
张世争 2020-11-20 09:02:20 +08:00
parent 9dc0bbb814
commit e8eb74da58
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/drivers/rtc/alarm.c
View File

@ -8,6 +8,7 @@
* 2012-10-27 heyuanjie87 first version. * 2012-10-27 heyuanjie87 first version.
* 2013-05-17 aozima initial alarm event & mutex in system init. * 2013-05-17 aozima initial alarm event & mutex in system init.
* 2020-10-15 zhangsz add alarm flags hour minute second. * 2020-10-15 zhangsz add alarm flags hour minute second.
* 2020-11-09 zhangsz fix alarm set when modify rtc time.
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -102,7 +103,7 @@ static void alarm_wakeup(struct rt_alarm *alarm, struct tm *now)
{ {
alarm->wktime.tm_hour = now->tm_hour; alarm->wktime.tm_hour = now->tm_hour;
alarm->wktime.tm_min = now->tm_min; alarm->wktime.tm_min = now->tm_min;
alarm->wktime.tm_sec = alarm->wktime.tm_sec + 1; alarm->wktime.tm_sec = now->tm_sec + 1;
if (alarm->wktime.tm_sec > 59) if (alarm->wktime.tm_sec > 59)
{ {
alarm->wktime.tm_sec = 0; alarm->wktime.tm_sec = 0;
@ -125,7 +126,7 @@ static void alarm_wakeup(struct rt_alarm *alarm, struct tm *now)
alarm->wktime.tm_hour = now->tm_hour; alarm->wktime.tm_hour = now->tm_hour;
if (alarm->wktime.tm_sec == now->tm_sec) if (alarm->wktime.tm_sec == now->tm_sec)
{ {
alarm->wktime.tm_min = alarm->wktime.tm_min + 1; alarm->wktime.tm_min = now->tm_min + 1;
if (alarm->wktime.tm_min > 59) if (alarm->wktime.tm_min > 59)
{ {
alarm->wktime.tm_min = 0; alarm->wktime.tm_min = 0;
@ -144,7 +145,7 @@ static void alarm_wakeup(struct rt_alarm *alarm, struct tm *now)
if ((alarm->wktime.tm_min == now->tm_min) && if ((alarm->wktime.tm_min == now->tm_min) &&
(alarm->wktime.tm_sec == now->tm_sec)) (alarm->wktime.tm_sec == now->tm_sec))
{ {
alarm->wktime.tm_hour = alarm->wktime.tm_hour + 1; alarm->wktime.tm_hour = now->tm_hour + 1;
if (alarm->wktime.tm_hour > 23) if (alarm->wktime.tm_hour > 23)
{ {
alarm->wktime.tm_hour = 0; alarm->wktime.tm_hour = 0;