Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SummerGao.
rt-thread
提交
b60adb2d
R
rt-thread
项目概览
SummerGao.
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
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,发现更多精彩内容 >>
未验证
提交
b60adb2d
编写于
9月 30, 2021
作者:
B
Bernard Xiong
提交者:
GitHub
9月 30, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5113 from armink/fix_rtc
Fix rtc
上级
1e36db0c
3fafe6e8
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
63 addition
and
45 deletion
+63
-45
bsp/simulator/drivers/drv_rtc.c
bsp/simulator/drivers/drv_rtc.c
+25
-19
bsp/stm32/libraries/HAL_Drivers/drv_rtc.c
bsp/stm32/libraries/HAL_Drivers/drv_rtc.c
+17
-5
components/drivers/include/drivers/rtc.h
components/drivers/include/drivers/rtc.h
+8
-8
components/drivers/rtc/rtc.c
components/drivers/rtc/rtc.c
+4
-4
components/libc/compilers/common/time.c
components/libc/compilers/common/time.c
+2
-2
include/rtdef.h
include/rtdef.h
+7
-7
未找到文件。
bsp/simulator/drivers/drv_rtc.c
浏览文件 @
b60adb2d
...
...
@@ -45,6 +45,23 @@ static void soft_rtc_alarm_update(struct rt_rtc_wkalarm *palarm)
#endif
static
void
get_rtc_timeval
(
struct
timeval
*
tv
)
{
struct
tm
newtime
=
{
0
};
SYSTEMTIME
sys_time
;
GetSystemTime
(
&
sys_time
);
newtime
.
tm_year
=
sys_time
.
wYear
-
1900
;
newtime
.
tm_mon
=
sys_time
.
wMonth
-
1
;
newtime
.
tm_mday
=
sys_time
.
wDay
;
newtime
.
tm_hour
=
sys_time
.
wHour
;
newtime
.
tm_min
=
sys_time
.
wMinute
;
newtime
.
tm_sec
=
sys_time
.
wSecond
;
tv
->
tv_sec
=
timegm
(
&
newtime
);
tv
->
tv_usec
=
sys_time
.
wMilliseconds
*
1000UL
;
}
static
rt_err_t
soft_rtc_control
(
rt_device_t
dev
,
int
cmd
,
void
*
args
)
{
__time32_t
*
t
;
...
...
@@ -56,17 +73,14 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
{
case
RT_DEVICE_CTRL_RTC_GET_TIME
:
{
t
=
(
__time32_t
*
)
args
;
SYSTEMTIME
sys_time
;
GetSystemTime
(
&
sys_time
);
newtime
.
tm_year
=
sys_time
.
wYear
-
1900
;
newtime
.
tm_mon
=
sys_time
.
wMonth
-
1
;
newtime
.
tm_mday
=
sys_time
.
wDay
;
newtime
.
tm_hour
=
sys_time
.
wHour
;
newtime
.
tm_min
=
sys_time
.
wMinute
;
newtime
.
tm_sec
=
sys_time
.
wSecond
;
*
t
=
timegm
(
&
newtime
);
struct
timeval
tv
;
get_rtc_timeval
(
&
tv
);
*
(
rt_uint32_t
*
)
args
=
tv
.
tv_sec
;
break
;
}
case
RT_DEVICE_CTRL_RTC_GET_TIMEVAL
:
{
get_rtc_timeval
((
struct
timeval
*
)
args
);
break
;
}
case
RT_DEVICE_CTRL_RTC_SET_TIME
:
...
...
@@ -85,14 +99,6 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
soft_rtc_alarm_update
(
&
wkalarm
);
break
;
#endif
case
RT_DEVICE_CTRL_RTC_GET_TIME_US
:
{
long
*
tv_usec
=
(
long
*
)
args
;
SYSTEMTIME
sys_time
;
GetSystemTime
(
&
sys_time
);
*
tv_usec
=
sys_time
.
wMilliseconds
*
1000UL
;
break
;
}
default:
return
-
RT_ERROR
;
}
...
...
bsp/stm32/libraries/HAL_Drivers/drv_rtc.c
浏览文件 @
b60adb2d
...
...
@@ -38,7 +38,7 @@ RT_WEAK void HAL_RTCEx_BKUPWrite(RTC_HandleTypeDef *hrtc, uint32_t BackupRegiste
return
;
}
static
time_t
get_rtc_timestamp
(
void
)
static
void
get_rtc_timeval
(
struct
timeval
*
tv
)
{
RTC_TimeTypeDef
RTC_TimeStruct
=
{
0
};
RTC_DateTypeDef
RTC_DateStruct
=
{
0
};
...
...
@@ -54,8 +54,11 @@ static time_t get_rtc_timestamp(void)
tm_new
.
tm_mon
=
RTC_DateStruct
.
Month
-
1
;
tm_new
.
tm_year
=
RTC_DateStruct
.
Year
+
100
;
LOG_D
(
"get rtc time."
);
return
timegm
(
&
tm_new
);
tv
->
tv_sec
=
timegm
(
&
tm_new
);
#if defined(SOC_SERIES_STM32H7)
tv
->
tv_usec
=
(
255
.
0
-
RTC_TimeStruct
.
SubSeconds
*
1
.
0
)
/
256
.
0
*
1000
.
0
*
1000
.
0
;
#endif
}
static
rt_err_t
set_rtc_time_stamp
(
time_t
time_stamp
)
...
...
@@ -243,7 +246,9 @@ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI1;
static
rt_err_t
stm32_rtc_get_secs
(
void
*
args
)
{
*
(
rt_uint32_t
*
)
args
=
get_rtc_timestamp
();
struct
timeval
tv
;
get_rtc_timeval
(
&
tv
);
*
(
rt_uint32_t
*
)
args
=
tv
.
tv_sec
;
LOG_D
(
"RTC: get rtc_time %x
\n
"
,
*
(
rt_uint32_t
*
)
args
);
return
RT_EOK
;
...
...
@@ -262,6 +267,13 @@ static rt_err_t stm32_rtc_set_secs(void *args)
return
result
;
}
static
rt_err_t
stm32_rtc_get_timeval
(
void
*
args
)
{
get_rtc_timeval
((
struct
timeval
*
)
args
);
return
RT_EOK
;
}
static
const
struct
rt_rtc_ops
stm32_rtc_ops
=
{
stm32_rtc_init
,
...
...
@@ -269,7 +281,7 @@ static const struct rt_rtc_ops stm32_rtc_ops =
stm32_rtc_set_secs
,
RT_NULL
,
RT_NULL
,
RT_NULL
,
stm32_rtc_get_timeval
,
RT_NULL
,
};
...
...
components/drivers/include/drivers/rtc.h
浏览文件 @
b60adb2d
...
...
@@ -15,12 +15,12 @@
#include <rtdef.h>
#define RT_DEVICE_CTRL_RTC_GET_TIME 0x
1
0
/**< get second time */
#define RT_DEVICE_CTRL_RTC_SET_TIME 0x
1
1
/**< set second time */
#define RT_DEVICE_CTRL_RTC_GET_TIME
_US 0x12
/**< get microsecond time
*/
#define RT_DEVICE_CTRL_RTC_SET_TIME
_US 0x13
/**< set microsecond time
*/
#define RT_DEVICE_CTRL_RTC_GET_ALARM 0x
1
4
/**< get alarm */
#define RT_DEVICE_CTRL_RTC_SET_ALARM 0x
1
5
/**< set alarm */
#define RT_DEVICE_CTRL_RTC_GET_TIME 0x
2
0
/**< get second time */
#define RT_DEVICE_CTRL_RTC_SET_TIME 0x
2
1
/**< set second time */
#define RT_DEVICE_CTRL_RTC_GET_TIME
VAL 0x22
/**< get timeval for gettimeofday
*/
#define RT_DEVICE_CTRL_RTC_SET_TIME
VAL 0x23
/**< set timeval for gettimeofday
*/
#define RT_DEVICE_CTRL_RTC_GET_ALARM 0x
2
4
/**< get alarm */
#define RT_DEVICE_CTRL_RTC_SET_ALARM 0x
2
5
/**< set alarm */
struct
rt_rtc_ops
{
...
...
@@ -29,8 +29,8 @@ struct rt_rtc_ops
rt_err_t
(
*
set_secs
)(
void
*
arg
);
rt_err_t
(
*
get_alarm
)(
void
*
arg
);
rt_err_t
(
*
set_alarm
)(
void
*
arg
);
rt_err_t
(
*
get_
usecs
)(
void
*
arg
);
rt_err_t
(
*
set_
usecs
)(
void
*
arg
);
rt_err_t
(
*
get_
timeval
)(
void
*
arg
);
rt_err_t
(
*
set_
timeval
)(
void
*
arg
);
};
typedef
struct
rt_rtc_device
...
...
components/drivers/rtc/rtc.c
浏览文件 @
b60adb2d
...
...
@@ -71,11 +71,11 @@ static rt_err_t rt_rtc_control(struct rt_device *dev, int cmd, void *args)
case
RT_DEVICE_CTRL_RTC_SET_TIME
:
ret
=
TRY_DO_RTC_FUNC
(
rtc_device
,
set_secs
,
args
);
break
;
case
RT_DEVICE_CTRL_RTC_GET_TIME
_US
:
ret
=
TRY_DO_RTC_FUNC
(
rtc_device
,
get_
usecs
,
args
);
case
RT_DEVICE_CTRL_RTC_GET_TIME
VAL
:
ret
=
TRY_DO_RTC_FUNC
(
rtc_device
,
get_
timeval
,
args
);
break
;
case
RT_DEVICE_CTRL_RTC_SET_TIME
_US
:
ret
=
TRY_DO_RTC_FUNC
(
rtc_device
,
set_
usecs
,
args
);
case
RT_DEVICE_CTRL_RTC_SET_TIME
VAL
:
ret
=
TRY_DO_RTC_FUNC
(
rtc_device
,
set_
timeval
,
args
);
break
;
case
RT_DEVICE_CTRL_RTC_GET_ALARM
:
ret
=
TRY_DO_RTC_FUNC
(
rtc_device
,
get_alarm
,
args
);
...
...
components/libc/compilers/common/time.c
浏览文件 @
b60adb2d
...
...
@@ -101,7 +101,7 @@ static rt_err_t get_timeval(struct timeval *tv)
if
(
rt_device_open
(
device
,
0
)
==
RT_EOK
)
{
rst
=
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
,
&
tv
->
tv_sec
);
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
_US
,
&
tv
->
tv_usec
);
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
VAL
,
tv
);
rt_device_close
(
device
);
}
}
...
...
@@ -147,7 +147,7 @@ static int set_timeval(struct timeval *tv)
if
(
rt_device_open
(
device
,
0
)
==
RT_EOK
)
{
rst
=
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_SET_TIME
,
&
tv
->
tv_sec
);
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_SET_TIME
_US
,
&
tv
->
tv_usec
);
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_SET_TIME
VAL
,
tv
);
rt_device_close
(
device
);
}
}
...
...
include/rtdef.h
浏览文件 @
b60adb2d
...
...
@@ -966,13 +966,13 @@ enum rt_device_class_type
/**
* special device commands
*/
#define RT_DEVICE_CTRL_CHAR_STREAM 0x
1
0
/**< stream mode on char device */
#define RT_DEVICE_CTRL_BLK_GETGEOME 0x
1
0
/**< get geometry information */
#define RT_DEVICE_CTRL_BLK_SYNC 0x
1
1
/**< flush data to block device */
#define RT_DEVICE_CTRL_BLK_ERASE 0x
1
2
/**< erase block on block device */
#define RT_DEVICE_CTRL_BLK_AUTOREFRESH 0x
1
3
/**< block device : enter/exit auto refresh mode */
#define RT_DEVICE_CTRL_NETIF_GETMAC 0x
1
0
/**< get mac address */
#define RT_DEVICE_CTRL_MTD_FORMAT 0x
1
0
/**< format a MTD device */
#define RT_DEVICE_CTRL_CHAR_STREAM 0x
2
0
/**< stream mode on char device */
#define RT_DEVICE_CTRL_BLK_GETGEOME 0x
2
0
/**< get geometry information */
#define RT_DEVICE_CTRL_BLK_SYNC 0x
2
1
/**< flush data to block device */
#define RT_DEVICE_CTRL_BLK_ERASE 0x
2
2
/**< erase block on block device */
#define RT_DEVICE_CTRL_BLK_AUTOREFRESH 0x
2
3
/**< block device : enter/exit auto refresh mode */
#define RT_DEVICE_CTRL_NETIF_GETMAC 0x
2
0
/**< get mac address */
#define RT_DEVICE_CTRL_MTD_FORMAT 0x
2
0
/**< format a MTD device */
typedef
struct
rt_device
*
rt_device_t
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录