Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
fd3eb65e
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,发现更多精彩内容 >>
未验证
提交
fd3eb65e
编写于
2月 15, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
2月 15, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2331 from Guozhanxin/sensor_1
完善 Sensor
上级
a659f041
fb9482d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
4 deletion
+5
-4
components/drivers/sensors/sensor.c
components/drivers/sensors/sensor.c
+1
-1
components/drivers/sensors/sensor.h
components/drivers/sensors/sensor.h
+3
-2
components/drivers/sensors/sensor_cmd.c
components/drivers/sensors/sensor_cmd.c
+1
-1
未找到文件。
components/drivers/sensors/sensor.c
浏览文件 @
fd3eb65e
...
@@ -179,7 +179,7 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
...
@@ -179,7 +179,7 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
rt_sensor_irq_init
(
sensor
);
rt_sensor_irq_init
(
sensor
);
}
}
}
}
else
if
(
oflag
&
RT_
SENSOR_FLAG_FIFO
&&
dev
->
flag
&
RT_SENSOR_FLAG_FIFO
)
else
if
(
oflag
&
RT_
DEVICE_FLAG_FIFO_RX
&&
dev
->
flag
&
RT_DEVICE_FLAG_FIFO_RX
)
{
{
/* If fifo mode is supported, configure it to fifo mode */
/* If fifo mode is supported, configure it to fifo mode */
if
(
sensor
->
ops
->
control
(
sensor
,
RT_SENSOR_CTRL_SET_MODE
,
(
void
*
)
RT_SENSOR_MODE_FIFO
)
==
RT_EOK
)
if
(
sensor
->
ops
->
control
(
sensor
,
RT_SENSOR_CTRL_SET_MODE
,
(
void
*
)
RT_SENSOR_MODE_FIFO
)
==
RT_EOK
)
...
...
components/drivers/sensors/sensor.h
浏览文件 @
fd3eb65e
...
@@ -25,7 +25,7 @@ extern "C" {
...
@@ -25,7 +25,7 @@ extern "C" {
#endif
#endif
#define RT_PIN_NONE 0xFFFF
/* RT PIN NONE */
#define RT_PIN_NONE 0xFFFF
/* RT PIN NONE */
#define RT_
SENSOR_FLAG_FIFO
0x200
/* Flag to use when the sensor is open by fifo mode */
#define RT_
DEVICE_FLAG_FIFO_RX
0x200
/* Flag to use when the sensor is open by fifo mode */
#define RT_SENSOR_MODULE_MAX (3)
/* The maximum number of members of a sensor module */
#define RT_SENSOR_MODULE_MAX (3)
/* The maximum number of members of a sensor module */
...
@@ -67,6 +67,7 @@ extern "C" {
...
@@ -67,6 +67,7 @@ extern "C" {
#define RT_SENSOR_UNIT_DCELSIUS (8)
/* Temperature unit: dCelsius */
#define RT_SENSOR_UNIT_DCELSIUS (8)
/* Temperature unit: dCelsius */
#define RT_SENSOR_UNIT_HZ (9)
/* Frequency unit: HZ */
#define RT_SENSOR_UNIT_HZ (9)
/* Frequency unit: HZ */
#define RT_SENSOR_UNIT_ONE (10)
/* Dimensionless quantity unit: 1 */
#define RT_SENSOR_UNIT_ONE (10)
/* Dimensionless quantity unit: 1 */
#define RT_SENSOR_UNIT_BPM (11)
/* Heart rate unit: bpm */
/* Sensor communication interface types */
/* Sensor communication interface types */
...
@@ -176,7 +177,7 @@ struct rt_sensor_data
...
@@ -176,7 +177,7 @@ struct rt_sensor_data
rt_int32_t
baro
;
/* Pressure. unit: pascal (Pa) */
rt_int32_t
baro
;
/* Pressure. unit: pascal (Pa) */
rt_int32_t
light
;
/* Light. unit: lux */
rt_int32_t
light
;
/* Light. unit: lux */
rt_int32_t
proximity
;
/* Distance. unit: centimeters */
rt_int32_t
proximity
;
/* Distance. unit: centimeters */
rt_int32_t
hr
;
/* Hea
t rate. unit: HZ
*/
rt_int32_t
hr
;
/* Hea
rt rate. unit: bpm
*/
rt_int32_t
tvoc
;
/* TVOC. unit: permillage */
rt_int32_t
tvoc
;
/* TVOC. unit: permillage */
rt_int32_t
noise
;
/* Noise Loudness. unit: HZ */
rt_int32_t
noise
;
/* Noise Loudness. unit: HZ */
rt_uint32_t
step
;
/* Step sensor. unit: 1 */
rt_uint32_t
step
;
/* Step sensor. unit: 1 */
...
...
components/drivers/sensors/sensor_cmd.c
浏览文件 @
fd3eb65e
...
@@ -119,7 +119,7 @@ static void sensor_fifo(int argc, char **argv)
...
@@ -119,7 +119,7 @@ static void sensor_fifo(int argc, char **argv)
rt_device_set_rx_indicate
(
dev
,
rx_callback
);
rt_device_set_rx_indicate
(
dev
,
rx_callback
);
if
(
rt_device_open
(
dev
,
RT_
SENSOR_FLAG_FIFO
)
!=
RT_EOK
)
if
(
rt_device_open
(
dev
,
RT_
DEVICE_FLAG_FIFO_RX
)
!=
RT_EOK
)
{
{
LOG_E
(
"open device failed!"
);
LOG_E
(
"open device failed!"
);
return
;
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录