Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码匠许师傅
rt-thread
提交
fb8e9ea9
R
rt-thread
项目概览
码匠许师傅
/
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
fb8e9ea9
编写于
2月 03, 2023
作者:
Z
Zxy
提交者:
GitHub
2月 02, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[sensor] 修复命令交互使用日志输出API的问题 (#6895)
命令交互应使用rt_kprintf,而非LOG_x
上级
83bd8614
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
24 deletion
+24
-24
components/drivers/sensor/sensor_cmd.c
components/drivers/sensor/sensor_cmd.c
+24
-24
未找到文件。
components/drivers/sensor/sensor_cmd.c
浏览文件 @
fb8e9ea9
...
...
@@ -205,7 +205,7 @@ static const char* sensor_get_accuracy_mode_name(rt_sensor_info_t info)
case
RT_SENSOR_MODE_ACCURACY_NOTRUST
:
return
RT_SENSOR_MACRO_GET_NAME
(
RT_SENSOR_MODE_ACCURACY_NOTRUST
);
default:
LOG_E
(
"accuracy mode illegal!
"
);
rt_kprintf
(
"accuracy mode illegal!
\n
"
);
return
""
;
}
}
...
...
@@ -227,7 +227,7 @@ static const char* sensor_get_power_mode_name(rt_sensor_info_t info)
case
RT_SENSOR_MODE_POWER_DOWN
:
return
RT_SENSOR_MACRO_GET_NAME
(
RT_SENSOR_MODE_POWER_DOWN
);
default:
LOG_E
(
"power mode illegal!
"
);
rt_kprintf
(
"power mode illegal!
\n
"
);
return
""
;
}
}
...
...
@@ -243,7 +243,7 @@ static const char* sensor_get_fetch_mode_name(rt_sensor_info_t info)
case
RT_SENSOR_MODE_FETCH_FIFO
:
return
RT_SENSOR_MACRO_GET_NAME
(
RT_SENSOR_MODE_FETCH_FIFO
);
default:
LOG_E
(
"fetch data mode illegal!
"
);
rt_kprintf
(
"fetch data mode illegal!
\n
"
);
return
""
;
}
}
...
...
@@ -254,66 +254,66 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor
switch
(
sensor
->
info
.
type
)
{
case
RT_SENSOR_TYPE_ACCE
:
LOG_I
(
"num:%d, x:%f, y:%f, z:%f %s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
acce
.
x
,
sensor_data
->
data
.
acce
.
y
,
sensor_data
->
data
.
acce
.
z
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, x:%f, y:%f, z:%f %s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
acce
.
x
,
sensor_data
->
data
.
acce
.
y
,
sensor_data
->
data
.
acce
.
z
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_GYRO
:
LOG_I
(
"num:%d, x:%f, y:%f, z:%f %s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
gyro
.
x
,
sensor_data
->
data
.
gyro
.
y
,
sensor_data
->
data
.
gyro
.
z
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, x:%f, y:%f, z:%f %s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
gyro
.
x
,
sensor_data
->
data
.
gyro
.
y
,
sensor_data
->
data
.
gyro
.
z
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_MAG
:
LOG_I
(
"num:%d, x:%f, y:%f, z:%f %s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
mag
.
x
,
sensor_data
->
data
.
mag
.
y
,
sensor_data
->
data
.
mag
.
z
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, x:%f, y:%f, z:%f %s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
mag
.
x
,
sensor_data
->
data
.
mag
.
y
,
sensor_data
->
data
.
mag
.
z
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_GNSS
:
LOG_I
(
"num:%d, lon:%f, lat:%f %s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
coord
.
longitude
,
sensor_data
->
data
.
coord
.
latitude
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, lon:%f, lat:%f %s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
coord
.
longitude
,
sensor_data
->
data
.
coord
.
latitude
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_TEMP
:
LOG_I
(
"num:%d, temp:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
temp
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, temp:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
temp
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_HUMI
:
LOG_I
(
"num:%d, humi:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
humi
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, humi:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
humi
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_BARO
:
LOG_I
(
"num:%d, press:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
baro
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, press:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
baro
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_LIGHT
:
LOG_I
(
"num:%d, light:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
light
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, light:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
light
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_PROXIMITY
:
case
RT_SENSOR_TYPE_TOF
:
LOG_I
(
"num:%d, distance:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
proximity
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, distance:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
proximity
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_HR
:
LOG_I
(
"num:%d, heart rate:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
hr
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, heart rate:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
hr
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_TVOC
:
LOG_I
(
"num:%d, tvoc:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
tvoc
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, tvoc:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
tvoc
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_NOISE
:
LOG_I
(
"num:%d, noise:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
noise
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, noise:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
noise
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_STEP
:
LOG_I
(
"num:%d, step:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
step
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, step:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
step
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_FORCE
:
LOG_I
(
"num:%d, force:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
force
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, force:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
force
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_DUST
:
LOG_I
(
"num:%d, dust:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
dust
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, dust:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
dust
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_ECO2
:
LOG_I
(
"num:%d, eco2:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
eco2
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, eco2:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
eco2
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_IAQ
:
LOG_I
(
"num:%d, IAQ:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
iaq
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, IAQ:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
iaq
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_ETOH
:
LOG_I
(
"num:%d, EtOH:%f%s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
etoh
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, EtOH:%f%s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
etoh
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_BP
:
LOG_I
(
"num:%d, bp.sbp:%f, bp.dbp:%f %s, timestamp:%u
"
,
num
,
sensor_data
->
data
.
bp
.
sbp
,
sensor_data
->
data
.
bp
.
dbp
,
unit_name
,
sensor_data
->
timestamp
);
rt_kprintf
(
"num:%d, bp.sbp:%f, bp.dbp:%f %s, timestamp:%u
\n
"
,
num
,
sensor_data
->
data
.
bp
.
sbp
,
sensor_data
->
data
.
bp
.
dbp
,
unit_name
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_TYPE_NONE
:
default:
LOG_E
(
"Unknown type of sensor!
"
);
rt_kprintf
(
"Unknown type of sensor!
\n
"
);
break
;
}
}
...
...
@@ -687,7 +687,7 @@ static void sensor(int argc, char **argv)
}
if
(
rt_device_control
(
new_dev
,
RT_SENSOR_CTRL_GET_ID
,
&
reg
)
==
RT_EOK
)
{
LOG_I
(
"Sensor Chip ID: %#x
"
,
reg
);
rt_kprintf
(
"Sensor Chip ID: %#x
\n
"
,
reg
);
}
if
(
dev
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录