Skip to content

R
rt-thread

wwsmg1 / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 1
Star 1
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

提交 e8eb74da 编写于 作者: 张 张世争
浏览文件
操作

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

上级 9dc0bbb8
隐藏空白更改
内联 并排
Showing with 4 addition and 3 deletion
components/drivers/rtc/alarm.c
浏览文件 @ e8eb74da
...@@ -8,6 +8,7 @@ ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或