Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
8f2f2328
R
rt-thread
项目概览
BaiXuePrincess
/
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,发现更多精彩内容 >>
提交
8f2f2328
编写于
5月 08, 2019
作者:
G
guozhanxin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[sensor] 完善sensor框架
* 修复开启 RTC 编译报错的问题。 * 在显示 sensor 数据时添加单位。
上级
1fe6888e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
5 deletion
+5
-5
components/drivers/sensors/sensor.h
components/drivers/sensors/sensor.h
+1
-1
components/drivers/sensors/sensor_cmd.c
components/drivers/sensors/sensor_cmd.c
+4
-4
未找到文件。
components/drivers/sensors/sensor.h
浏览文件 @
8f2f2328
...
...
@@ -19,7 +19,7 @@ extern "C" {
#endif
#ifdef RT_USING_RTC
#define rt_sensor_get_ts() time(
)
/* API for the sensor to get the timestamp */
#define rt_sensor_get_ts() time(
RT_NULL)
/* API for the sensor to get the timestamp */
#else
#define rt_sensor_get_ts() rt_tick_get()
/* API for the sensor to get the timestamp */
#endif
...
...
components/drivers/sensors/sensor_cmd.c
浏览文件 @
8f2f2328
...
...
@@ -24,13 +24,13 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor
switch
(
sensor
->
info
.
type
)
{
case
RT_SENSOR_CLASS_ACCE
:
LOG_I
(
"num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d"
,
num
,
sensor_data
->
data
.
acce
.
x
,
sensor_data
->
data
.
acce
.
y
,
sensor_data
->
data
.
acce
.
z
,
sensor_data
->
timestamp
);
LOG_I
(
"num:%3d, x:%5d, y:%5d, z:%5d
mg
, timestamp:%5d"
,
num
,
sensor_data
->
data
.
acce
.
x
,
sensor_data
->
data
.
acce
.
y
,
sensor_data
->
data
.
acce
.
z
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_CLASS_GYRO
:
LOG_I
(
"num:%3d, x:%8d, y:%8d, z:%8d
, timestamp:%5d"
,
num
,
sensor_data
->
data
.
gyro
.
x
,
sensor_data
->
data
.
gyro
.
y
,
sensor_data
->
data
.
gyro
.
z
,
sensor_data
->
timestamp
);
LOG_I
(
"num:%3d, x:%8d, y:%8d, z:%8d
dps, timestamp:%5d"
,
num
,
sensor_data
->
data
.
gyro
.
x
/
1000
,
sensor_data
->
data
.
gyro
.
y
/
1000
,
sensor_data
->
data
.
gyro
.
z
/
1000
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_CLASS_MAG
:
LOG_I
(
"num:%3d, x:%5d, y:%5d, z:%5d, timestamp:%5d"
,
num
,
sensor_data
->
data
.
mag
.
x
,
sensor_data
->
data
.
mag
.
y
,
sensor_data
->
data
.
mag
.
z
,
sensor_data
->
timestamp
);
LOG_I
(
"num:%3d, x:%5d, y:%5d, z:%5d
mGauss
, timestamp:%5d"
,
num
,
sensor_data
->
data
.
mag
.
x
,
sensor_data
->
data
.
mag
.
y
,
sensor_data
->
data
.
mag
.
z
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_CLASS_HUMI
:
LOG_I
(
"num:%3d, humi:%3d.%d%%, timestamp:%5d"
,
num
,
sensor_data
->
data
.
humi
/
10
,
sensor_data
->
data
.
humi
%
10
,
sensor_data
->
timestamp
);
...
...
@@ -39,7 +39,7 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor
LOG_I
(
"num:%3d, temp:%3d.%dC, timestamp:%5d"
,
num
,
sensor_data
->
data
.
temp
/
10
,
sensor_data
->
data
.
temp
%
10
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_CLASS_BARO
:
LOG_I
(
"num:%3d, press:%5d, timestamp:%5d"
,
num
,
sensor_data
->
data
.
baro
,
sensor_data
->
timestamp
);
LOG_I
(
"num:%3d, press:%5d
pa
, timestamp:%5d"
,
num
,
sensor_data
->
data
.
baro
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_CLASS_STEP
:
LOG_I
(
"num:%3d, step:%5d, timestamp:%5d"
,
num
,
sensor_data
->
data
.
step
,
sensor_data
->
timestamp
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录