Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SummerGao.
rt-thread
提交
3a7ee557
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,发现更多精彩内容 >>
提交
3a7ee557
编写于
12月 25, 2022
作者:
mysterywolf
提交者:
mysterywolf
12月 26, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[sensor] 优化control参数检查和sensor list命令
上级
20a6f14e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
88 addition
and
60 deletion
+88
-60
components/drivers/include/drivers/sensor.h
components/drivers/include/drivers/sensor.h
+1
-1
components/drivers/sensor/sensor.c
components/drivers/sensor/sensor.c
+76
-52
components/drivers/sensor/sensor_cmd.c
components/drivers/sensor/sensor_cmd.c
+11
-7
未找到文件。
components/drivers/include/drivers/sensor.h
浏览文件 @
3a7ee557
...
...
@@ -47,7 +47,7 @@ extern "C" {
#define RT_SENSOR_TYPE_BARO (6)
#define RT_SENSOR_TYPE_BARO_STR "Barometer"
#define RT_SENSOR_TYPE_LIGHT (7)
#define RT_SENSOR_TYPE_LIGHT_STR "Ambient
l
ight"
#define RT_SENSOR_TYPE_LIGHT_STR "Ambient
L
ight"
#define RT_SENSOR_TYPE_PROXIMITY (8)
#define RT_SENSOR_TYPE_PROXIMITY_STR "Proximity"
#define RT_SENSOR_TYPE_HR (9)
...
...
components/drivers/sensor/sensor.c
浏览文件 @
3a7ee557
...
...
@@ -337,6 +337,7 @@ static rt_err_t _sensor_control(rt_device_t dev, int cmd, void *args)
rt_err_t
result
=
RT_EOK
;
RT_ASSERT
(
dev
!=
RT_NULL
);
rt_err_t
(
*
local_ctrl
)(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
)
=
_local_control
;
rt_uint8_t
mode
;
if
(
sensor
->
module
)
{
...
...
@@ -349,58 +350,81 @@ static rt_err_t _sensor_control(rt_device_t dev, int cmd, void *args)
switch
(
cmd
)
{
case
RT_SENSOR_CTRL_GET_ID
:
if
(
args
)
{
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_GET_ID
,
args
);
}
break
;
case
RT_SENSOR_CTRL_SET_ACCURACY_MODE
:
/* Configuration sensor power mode */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_ACCURACY_MODE
,
args
);
if
(
result
==
RT_EOK
)
{
RT_SENSOR_MODE_SET_ACCURACY
(
sensor
->
info
.
mode
,
(
rt_uint32_t
)
args
&
0x0F
);
LOG_D
(
"set accuracy mode code: %d"
,
RT_SENSOR_MODE_GET_ACCURACY
(
sensor
->
info
.
mode
));
}
break
;
case
RT_SENSOR_CTRL_SET_POWER_MODE
:
/* Configuration sensor power mode */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_POWER_MODE
,
args
);
if
(
result
==
RT_EOK
)
{
RT_SENSOR_MODE_SET_POWER
(
sensor
->
info
.
mode
,
(
rt_uint32_t
)
args
&
0x0F
);
LOG_D
(
"set power mode code: %d"
,
RT_SENSOR_MODE_GET_POWER
(
sensor
->
info
.
mode
));
}
break
;
case
RT_SENSOR_CTRL_SET_FETCH_MODE
:
/* Configuration sensor power mode */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_FETCH_MODE
,
args
);
if
(
result
==
RT_EOK
)
{
RT_SENSOR_MODE_SET_FETCH
(
sensor
->
info
.
mode
,
(
rt_uint32_t
)
args
&
0x0F
);
LOG_D
(
"set fetch mode code: %d"
,
RT_SENSOR_MODE_GET_FETCH
(
sensor
->
info
.
mode
));
}
break
;
case
RT_SENSOR_CTRL_SELF_TEST
:
/* device self test */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SELF_TEST
,
args
);
break
;
case
RT_SENSOR_CTRL_SOFT_RESET
:
/* device soft reset */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SOFT_RESET
,
args
);
break
;
default:
if
(
cmd
>
RT_SENSOR_CTRL_USER_CMD_START
)
{
/* Custom commands */
result
=
local_ctrl
(
sensor
,
cmd
,
args
);
}
else
{
result
=
-
RT_ERROR
;
}
break
;
case
RT_SENSOR_CTRL_GET_ID
:
if
(
args
)
{
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_GET_ID
,
args
);
}
break
;
case
RT_SENSOR_CTRL_SET_ACCURACY_MODE
:
/* Configuration sensor power mode */
mode
=
(
rt_uint32_t
)
args
;
if
(
!
(
mode
==
RT_SENSOR_MODE_ACCURACY_HIGHEST
||
mode
==
RT_SENSOR_MODE_ACCURACY_HIGH
||
\
mode
==
RT_SENSOR_MODE_ACCURACY_MEDIUM
||
mode
==
RT_SENSOR_MODE_ACCURACY_LOW
||
\
mode
==
RT_SENSOR_MODE_ACCURACY_LOWEST
||
mode
==
RT_SENSOR_MODE_ACCURACY_NOTRUST
))
{
LOG_E
(
"sensor accuracy mode illegal: %d"
,
mode
);
return
-
RT_EINVAL
;
}
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_ACCURACY_MODE
,
args
);
if
(
result
==
RT_EOK
)
{
RT_SENSOR_MODE_SET_ACCURACY
(
sensor
->
info
.
mode
,
(
rt_uint32_t
)
args
&
0x0F
);
LOG_D
(
"set accuracy mode code: %d"
,
RT_SENSOR_MODE_GET_ACCURACY
(
sensor
->
info
.
mode
));
}
break
;
case
RT_SENSOR_CTRL_SET_POWER_MODE
:
/* Configuration sensor power mode */
mode
=
(
rt_uint32_t
)
args
;
if
(
!
(
mode
==
RT_SENSOR_MODE_POWER_HIGHEST
||
mode
==
RT_SENSOR_MODE_POWER_HIGH
||
\
mode
==
RT_SENSOR_MODE_POWER_MEDIUM
||
mode
==
RT_SENSOR_MODE_POWER_LOW
||
\
mode
==
RT_SENSOR_MODE_POWER_LOWEST
||
mode
==
RT_SENSOR_MODE_POWER_DOWN
))
{
LOG_E
(
"sensor power mode illegal: %d"
,
mode
);
return
-
RT_EINVAL
;
}
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_POWER_MODE
,
args
);
if
(
result
==
RT_EOK
)
{
RT_SENSOR_MODE_SET_POWER
(
sensor
->
info
.
mode
,
(
rt_uint32_t
)
args
&
0x0F
);
LOG_D
(
"set power mode code: %d"
,
RT_SENSOR_MODE_GET_POWER
(
sensor
->
info
.
mode
));
}
break
;
case
RT_SENSOR_CTRL_SET_FETCH_MODE
:
/* Configuration sensor power mode */
mode
=
(
rt_uint32_t
)
args
;
if
(
!
(
mode
==
RT_SENSOR_MODE_FETCH_POLLING
||
mode
==
RT_SENSOR_MODE_FETCH_INT
||
\
mode
==
RT_SENSOR_MODE_FETCH_FIFO
))
{
LOG_E
(
"sensor fetch data mode illegal: %d"
,
mode
);
return
-
RT_EINVAL
;
}
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_FETCH_MODE
,
args
);
if
(
result
==
RT_EOK
)
{
RT_SENSOR_MODE_SET_FETCH
(
sensor
->
info
.
mode
,
(
rt_uint32_t
)
args
&
0x0F
);
LOG_D
(
"set fetch mode code: %d"
,
RT_SENSOR_MODE_GET_FETCH
(
sensor
->
info
.
mode
));
}
break
;
case
RT_SENSOR_CTRL_SELF_TEST
:
/* device self test */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SELF_TEST
,
args
);
break
;
case
RT_SENSOR_CTRL_SOFT_RESET
:
/* device soft reset */
result
=
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SOFT_RESET
,
args
);
break
;
default:
if
(
cmd
>
RT_SENSOR_CTRL_USER_CMD_START
)
{
/* Custom commands */
result
=
local_ctrl
(
sensor
,
cmd
,
args
);
}
else
{
result
=
-
RT_EINVAL
;
}
break
;
}
if
(
sensor
->
module
)
...
...
components/drivers/sensor/sensor_cmd.c
浏览文件 @
3a7ee557
...
...
@@ -535,9 +535,12 @@ static void sensor_cmd_warning_unknown(void)
{
LOG_W
(
"Unknown command, please enter 'sensor' get help information!"
);
rt_kprintf
(
"sensor [OPTION] [PARAM]
\n
"
);
rt_kprintf
(
" list list all sensor devices
\n
"
);
rt_kprintf
(
" probe <dev_name> probe sensor by given name
\n
"
);
rt_kprintf
(
" info get sensor information
\n
"
);
rt_kprintf
(
" read [num] read [num] times sensor (default 5)
\n
"
);
rt_kprintf
(
" power [mode] set or get power mode
\n
"
);
rt_kprintf
(
" accuracy [mode] set or get accuracy mode
\n
"
);
}
static
void
sensor_cmd_warning_probe
(
void
)
...
...
@@ -625,8 +628,8 @@ static void sensor(int argc, char **argv)
if
(
information
==
RT_NULL
)
return
;
rt_kprintf
(
"device name sensor name
sensor type resolution mode
\n
"
);
rt_kprintf
(
"----------- ------------- ------------------ ----
--------- ----------
\n
"
);
rt_kprintf
(
"device name sensor name
sensor type mode resolution range
\n
"
);
rt_kprintf
(
"----------- ------------- ------------------ ----
---------- ----------
\n
"
);
for
(
node
=
information
->
object_list
.
next
;
node
!=
&
(
information
->
object_list
);
node
=
node
->
next
)
...
...
@@ -636,12 +639,13 @@ static void sensor(int argc, char **argv)
if
(
sensor_dev
->
parent
.
type
!=
RT_Device_Class_Sensor
)
continue
;
rt_kprintf
(
"%-*.*s %-*s %-*s %
f%-*s %s + %s + %
s
\n
"
,
rt_kprintf
(
"%-*.*s %-*s %-*s %
u%u%u %-*f %.*f - %.*f%-*
s
\n
"
,
RT_NAME_MAX
+
3
,
RT_NAME_MAX
,
sensor_dev
->
parent
.
parent
.
name
,
14
,
sensor_dev
->
info
.
name
,
17
,
sensor_get_type_name
(
&
sensor_dev
->
info
),
sensor_dev
->
info
.
accuracy
.
resolution
,
5
,
sensor_get_unit_name
(
&
sensor_dev
->
info
),
sensor_get_accuracy_mode_name
(
&
sensor_dev
->
info
),
sensor_get_power_mode_name
(
&
sensor_dev
->
info
),
sensor_get_fetch_mode_name
(
&
sensor_dev
->
info
));
13
,
sensor_dev
->
info
.
name
,
18
,
sensor_get_type_name
(
&
sensor_dev
->
info
),
RT_SENSOR_MODE_GET_ACCURACY
(
sensor_dev
->
info
.
mode
),
RT_SENSOR_MODE_GET_POWER
(
sensor_dev
->
info
.
mode
),
RT_SENSOR_MODE_GET_FETCH
(
sensor_dev
->
info
.
mode
),
10
,
sensor_dev
->
info
.
accuracy
.
resolution
,
2
,
sensor_dev
->
info
.
scale
.
range_min
,
2
,
sensor_dev
->
info
.
scale
.
range_max
,
5
,
sensor_get_unit_name
(
&
sensor_dev
->
info
));
}
}
else
if
(
!
strcmp
(
argv
[
1
],
"probe"
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录