Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_46254178
rt-thread
提交
d9a8cc71
R
rt-thread
项目概览
weixin_46254178
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
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,发现更多精彩内容 >>
未验证
提交
d9a8cc71
编写于
3月 08, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
3月 08, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2404 from Guozhanxin/temp_1
完善 sensor 框架
上级
382f2f17
f6eabb2d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
6 deletion
+19
-6
components/drivers/sensors/sensor.c
components/drivers/sensors/sensor.c
+5
-0
components/drivers/sensors/sensor.h
components/drivers/sensors/sensor.h
+5
-1
components/drivers/sensors/sensor_cmd.c
components/drivers/sensors/sensor_cmd.c
+9
-5
未找到文件。
components/drivers/sensors/sensor.c
浏览文件 @
d9a8cc71
...
...
@@ -43,6 +43,11 @@ void rt_sensor_cb(rt_sensor_t sen)
{
return
;
}
if
(
sen
->
irq_handle
!=
RT_NULL
)
{
sen
->
irq_handle
(
sen
);
}
/* The buffer is not empty. Read the data in the buffer first */
if
(
sen
->
data_len
>
0
)
...
...
components/drivers/sensors/sensor.h
浏览文件 @
d9a8cc71
...
...
@@ -68,6 +68,7 @@ extern "C" {
#define RT_SENSOR_UNIT_HZ (9)
/* Frequency unit: HZ */
#define RT_SENSOR_UNIT_ONE (10)
/* Dimensionless quantity unit: 1 */
#define RT_SENSOR_UNIT_BPM (11)
/* Heart rate unit: bpm */
#define RT_SENSOR_UNIT_MM (12)
/* Distance unit: mm */
/* Sensor communication interface types */
...
...
@@ -131,6 +132,8 @@ struct rt_sensor_config
rt_int32_t
range
;
/* sensor range of measurement */
};
typedef
struct
rt_sensor_device
*
rt_sensor_t
;
struct
rt_sensor_device
{
struct
rt_device
parent
;
/* The standard device */
...
...
@@ -144,8 +147,9 @@ struct rt_sensor_device
const
struct
rt_sensor_ops
*
ops
;
/* The sensor ops */
struct
rt_sensor_module
*
module
;
/* The sensor module */
rt_err_t
(
*
irq_handle
)(
rt_sensor_t
sensor
);
/* Called when an interrupt is generated, registered by the driver */
};
typedef
struct
rt_sensor_device
*
rt_sensor_t
;
struct
rt_sensor_module
{
...
...
components/drivers/sensors/sensor_cmd.c
浏览文件 @
d9a8cc71
...
...
@@ -44,6 +44,9 @@ static void sensor_show_data(rt_size_t num, rt_sensor_t sensor, struct rt_sensor
case
RT_SENSOR_CLASS_STEP
:
LOG_I
(
"num:%3d, step:%5d, timestamp:%5d"
,
num
,
sensor_data
->
data
.
step
,
sensor_data
->
timestamp
);
break
;
case
RT_SENSOR_CLASS_PROXIMITY
:
LOG_I
(
"num:%3d, distance:%5d, timestamp:%5d"
,
num
,
sensor_data
->
data
.
proximity
,
sensor_data
->
timestamp
);
break
;
default:
break
;
}
...
...
@@ -96,6 +99,12 @@ static void sensor_fifo(int argc, char **argv)
return
;
}
sensor
=
(
rt_sensor_t
)
dev
;
if
(
rt_device_open
(
dev
,
RT_DEVICE_FLAG_FIFO_RX
)
!=
RT_EOK
)
{
LOG_E
(
"open device failed!"
);
return
;
}
if
(
sensor_rx_sem
==
RT_NULL
)
{
...
...
@@ -117,11 +126,6 @@ static void sensor_fifo(int argc, char **argv)
rt_device_set_rx_indicate
(
dev
,
rx_callback
);
if
(
rt_device_open
(
dev
,
RT_DEVICE_FLAG_FIFO_RX
)
!=
RT_EOK
)
{
LOG_E
(
"open device failed!"
);
return
;
}
rt_device_control
(
dev
,
RT_SENSOR_CTRL_SET_ODR
,
(
void
*
)
20
);
}
#ifdef FINSH_USING_MSH
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录