Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
e8eb74da
R
rt-thread
项目概览
wwsmg1
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e8eb74da
编写于
11月 20, 2020
作者:
张
张世争
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[rtc.alarm][fix]fix alarm when update datetime
上级
9dc0bbb8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
3 deletion
+4
-3
components/drivers/rtc/alarm.c
components/drivers/rtc/alarm.c
+4
-3
未找到文件。
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录