Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SummerGao.
rt-thread
提交
255020bc
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,发现更多精彩内容 >>
提交
255020bc
编写于
11月 07, 2022
作者:
mysterywolf
提交者:
mysterywolf
11月 08, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[sensor] 统一数据结构名称和函数命名
上级
fe0a57c3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
38 deletion
+34
-38
components/drivers/include/drivers/sensor.h
components/drivers/include/drivers/sensor.h
+2
-2
components/drivers/sensors/SConscript
components/drivers/sensors/SConscript
+1
-1
components/drivers/sensors/sensor.c
components/drivers/sensors/sensor.c
+31
-35
未找到文件。
components/drivers/include/drivers/sensor.h
浏览文件 @
255020bc
...
@@ -238,8 +238,8 @@ struct rt_sensor_data
...
@@ -238,8 +238,8 @@ struct rt_sensor_data
struct
rt_sensor_ops
struct
rt_sensor_ops
{
{
rt_size_t
(
*
fetch_data
)(
struct
rt_sensor_device
*
sensor
,
void
*
buf
,
rt_size_t
len
);
rt_size_t
(
*
fetch_data
)(
rt_sensor_t
sensor
,
void
*
buf
,
rt_size_t
len
);
rt_err_t
(
*
control
)(
struct
rt_sensor_device
*
sensor
,
int
cmd
,
void
*
arg
);
rt_err_t
(
*
control
)(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
);
};
};
int
rt_hw_sensor_register
(
rt_sensor_t
sensor
,
int
rt_hw_sensor_register
(
rt_sensor_t
sensor
,
...
...
components/drivers/sensors/SConscript
浏览文件 @
255020bc
...
@@ -9,6 +9,6 @@ CPPPATH = [cwd, cwd + '/../include']
...
@@ -9,6 +9,6 @@ CPPPATH = [cwd, cwd + '/../include']
if
GetDepend
(
'RT_USING_SENSOR_CMD'
):
if
GetDepend
(
'RT_USING_SENSOR_CMD'
):
src
+=
[
'sensor_cmd.c'
]
src
+=
[
'sensor_cmd.c'
]
group
=
DefineGroup
(
'
Senso
rs'
,
src
,
depend
=
[
'RT_USING_SENSOR'
,
'RT_USING_DEVICE'
],
CPPPATH
=
CPPPATH
)
group
=
DefineGroup
(
'
DeviceDrive
rs'
,
src
,
depend
=
[
'RT_USING_SENSOR'
,
'RT_USING_DEVICE'
],
CPPPATH
=
CPPPATH
)
Return
(
'group'
)
Return
(
'group'
)
components/drivers/sensors/sensor.c
浏览文件 @
255020bc
...
@@ -43,11 +43,8 @@ static char *const sensor_name_str[] =
...
@@ -43,11 +43,8 @@ static char *const sensor_name_str[] =
"bp_"
/* Blood Pressure */
"bp_"
/* Blood Pressure */
};
};
/* Sensor interrupt correlation function */
/* sensor interrupt handler function */
/*
static
void
_sensor_cb
(
rt_sensor_t
sen
)
* Sensor interrupt handler function
*/
void
rt_sensor_cb
(
rt_sensor_t
sen
)
{
{
if
(
sen
->
parent
.
rx_indicate
==
RT_NULL
)
if
(
sen
->
parent
.
rx_indicate
==
RT_NULL
)
{
{
...
@@ -76,7 +73,7 @@ void rt_sensor_cb(rt_sensor_t sen)
...
@@ -76,7 +73,7 @@ void rt_sensor_cb(rt_sensor_t sen)
}
}
/* ISR for sensor interrupt */
/* ISR for sensor interrupt */
static
void
irq_callback
(
void
*
args
)
static
void
_
irq_callback
(
void
*
args
)
{
{
rt_sensor_t
sensor
=
(
rt_sensor_t
)
args
;
rt_sensor_t
sensor
=
(
rt_sensor_t
)
args
;
rt_uint8_t
i
;
rt_uint8_t
i
;
...
@@ -86,17 +83,17 @@ static void irq_callback(void *args)
...
@@ -86,17 +83,17 @@ static void irq_callback(void *args)
/* Invoke a callback for all sensors in the module */
/* Invoke a callback for all sensors in the module */
for
(
i
=
0
;
i
<
sensor
->
module
->
sen_num
;
i
++
)
for
(
i
=
0
;
i
<
sensor
->
module
->
sen_num
;
i
++
)
{
{
rt
_sensor_cb
(
sensor
->
module
->
sen
[
i
]);
_sensor_cb
(
sensor
->
module
->
sen
[
i
]);
}
}
}
}
else
else
{
{
rt
_sensor_cb
(
sensor
);
_sensor_cb
(
sensor
);
}
}
}
}
/* Sensor interrupt initialization function */
/* Sensor interrupt initialization function */
static
rt_err_t
rt
_sensor_irq_init
(
rt_sensor_t
sensor
)
static
rt_err_t
_sensor_irq_init
(
rt_sensor_t
sensor
)
{
{
if
(
sensor
->
config
.
irq_pin
.
pin
==
RT_PIN_NONE
)
if
(
sensor
->
config
.
irq_pin
.
pin
==
RT_PIN_NONE
)
{
{
...
@@ -107,15 +104,15 @@ static rt_err_t rt_sensor_irq_init(rt_sensor_t sensor)
...
@@ -107,15 +104,15 @@ static rt_err_t rt_sensor_irq_init(rt_sensor_t sensor)
if
(
sensor
->
config
.
irq_pin
.
mode
==
PIN_MODE_INPUT_PULLDOWN
)
if
(
sensor
->
config
.
irq_pin
.
mode
==
PIN_MODE_INPUT_PULLDOWN
)
{
{
rt_pin_attach_irq
(
sensor
->
config
.
irq_pin
.
pin
,
PIN_IRQ_MODE_RISING
,
irq_callback
,
(
void
*
)
sensor
);
rt_pin_attach_irq
(
sensor
->
config
.
irq_pin
.
pin
,
PIN_IRQ_MODE_RISING
,
_
irq_callback
,
(
void
*
)
sensor
);
}
}
else
if
(
sensor
->
config
.
irq_pin
.
mode
==
PIN_MODE_INPUT_PULLUP
)
else
if
(
sensor
->
config
.
irq_pin
.
mode
==
PIN_MODE_INPUT_PULLUP
)
{
{
rt_pin_attach_irq
(
sensor
->
config
.
irq_pin
.
pin
,
PIN_IRQ_MODE_FALLING
,
irq_callback
,
(
void
*
)
sensor
);
rt_pin_attach_irq
(
sensor
->
config
.
irq_pin
.
pin
,
PIN_IRQ_MODE_FALLING
,
_
irq_callback
,
(
void
*
)
sensor
);
}
}
else
if
(
sensor
->
config
.
irq_pin
.
mode
==
PIN_MODE_INPUT
)
else
if
(
sensor
->
config
.
irq_pin
.
mode
==
PIN_MODE_INPUT
)
{
{
rt_pin_attach_irq
(
sensor
->
config
.
irq_pin
.
pin
,
PIN_IRQ_MODE_RISING_FALLING
,
irq_callback
,
(
void
*
)
sensor
);
rt_pin_attach_irq
(
sensor
->
config
.
irq_pin
.
pin
,
PIN_IRQ_MODE_RISING_FALLING
,
_
irq_callback
,
(
void
*
)
sensor
);
}
}
rt_pin_irq_enable
(
sensor
->
config
.
irq_pin
.
pin
,
RT_TRUE
);
rt_pin_irq_enable
(
sensor
->
config
.
irq_pin
.
pin
,
RT_TRUE
);
...
@@ -125,31 +122,30 @@ static rt_err_t rt_sensor_irq_init(rt_sensor_t sensor)
...
@@ -125,31 +122,30 @@ static rt_err_t rt_sensor_irq_init(rt_sensor_t sensor)
return
0
;
return
0
;
}
}
// local rt_sensor_ops
/* sensor local ops */
static
rt_size_t
_local_fetch_data
(
rt_sensor_t
sensor
,
void
*
buf
,
rt_size_t
len
)
static
rt_size_t
local_fetch_data
(
struct
rt_sensor_device
*
sensor
,
void
*
buf
,
rt_size_t
len
)
{
{
LOG_D
(
"Undefined fetch_data"
);
LOG_D
(
"Undefined fetch_data"
);
return
0
;
return
0
;
}
}
static
rt_err_t
local_control
(
struct
rt_sensor_device
*
sensor
,
int
cmd
,
void
*
arg
)
static
rt_err_t
_local_control
(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
)
{
{
LOG_D
(
"Undefined control"
);
LOG_D
(
"Undefined control"
);
return
RT_ERROR
;
return
RT_ERROR
;
}
}
static
struct
rt_sensor_ops
local_ops
=
static
struct
rt_sensor_ops
local_ops
=
{
{
.
fetch_data
=
local_fetch_data
,
.
fetch_data
=
_
local_fetch_data
,
.
control
=
local_control
.
control
=
_
local_control
};
};
/* RT-Thread Device Interface */
/* RT-Thread Device Interface */
static
rt_err_t
rt
_sensor_open
(
rt_device_t
dev
,
rt_uint16_t
oflag
)
static
rt_err_t
_sensor_open
(
rt_device_t
dev
,
rt_uint16_t
oflag
)
{
{
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
RT_ASSERT
(
dev
!=
RT_NULL
);
RT_ASSERT
(
dev
!=
RT_NULL
);
rt_err_t
res
=
RT_EOK
;
rt_err_t
res
=
RT_EOK
;
rt_err_t
(
*
local_ctrl
)(
struct
rt_sensor_device
*
sensor
,
int
cmd
,
void
*
arg
)
=
local_control
;
rt_err_t
(
*
local_ctrl
)(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
)
=
_
local_control
;
if
(
sensor
->
module
)
if
(
sensor
->
module
)
{
{
...
@@ -184,7 +180,7 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
...
@@ -184,7 +180,7 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
if
(
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_MODE
,
(
void
*
)
RT_SENSOR_MODE_INT
)
==
RT_EOK
)
if
(
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_MODE
,
(
void
*
)
RT_SENSOR_MODE_INT
)
==
RT_EOK
)
{
{
/* Initialization sensor interrupt */
/* Initialization sensor interrupt */
rt
_sensor_irq_init
(
sensor
);
_sensor_irq_init
(
sensor
);
sensor
->
config
.
mode
=
RT_SENSOR_MODE_INT
;
sensor
->
config
.
mode
=
RT_SENSOR_MODE_INT
;
}
}
}
}
...
@@ -194,7 +190,7 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
...
@@ -194,7 +190,7 @@ static rt_err_t rt_sensor_open(rt_device_t dev, rt_uint16_t oflag)
if
(
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_MODE
,
(
void
*
)
RT_SENSOR_MODE_FIFO
)
==
RT_EOK
)
if
(
local_ctrl
(
sensor
,
RT_SENSOR_CTRL_SET_MODE
,
(
void
*
)
RT_SENSOR_MODE_FIFO
)
==
RT_EOK
)
{
{
/* Initialization sensor interrupt */
/* Initialization sensor interrupt */
rt
_sensor_irq_init
(
sensor
);
_sensor_irq_init
(
sensor
);
sensor
->
config
.
mode
=
RT_SENSOR_MODE_FIFO
;
sensor
->
config
.
mode
=
RT_SENSOR_MODE_FIFO
;
}
}
}
}
...
@@ -220,11 +216,11 @@ __exit:
...
@@ -220,11 +216,11 @@ __exit:
return
res
;
return
res
;
}
}
static
rt_err_t
rt
_sensor_close
(
rt_device_t
dev
)
static
rt_err_t
_sensor_close
(
rt_device_t
dev
)
{
{
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
int
i
;
int
i
;
rt_err_t
(
*
local_ctrl
)(
struct
rt_sensor_device
*
sensor
,
int
cmd
,
void
*
arg
)
=
local_control
;
rt_err_t
(
*
local_ctrl
)(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
)
=
_
local_control
;
RT_ASSERT
(
dev
!=
RT_NULL
);
RT_ASSERT
(
dev
!=
RT_NULL
);
...
@@ -279,7 +275,7 @@ __exit:
...
@@ -279,7 +275,7 @@ __exit:
return
RT_EOK
;
return
RT_EOK
;
}
}
static
rt_size_t
rt
_sensor_read
(
rt_device_t
dev
,
rt_off_t
pos
,
void
*
buf
,
rt_size_t
len
)
static
rt_size_t
_sensor_read
(
rt_device_t
dev
,
rt_off_t
pos
,
void
*
buf
,
rt_size_t
len
)
{
{
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
rt_size_t
result
=
0
;
rt_size_t
result
=
0
;
...
@@ -326,12 +322,12 @@ static rt_size_t rt_sensor_read(rt_device_t dev, rt_off_t pos, void *buf, rt_siz
...
@@ -326,12 +322,12 @@ static rt_size_t rt_sensor_read(rt_device_t dev, rt_off_t pos, void *buf, rt_siz
return
result
;
return
result
;
}
}
static
rt_err_t
rt
_sensor_control
(
rt_device_t
dev
,
int
cmd
,
void
*
args
)
static
rt_err_t
_sensor_control
(
rt_device_t
dev
,
int
cmd
,
void
*
args
)
{
{
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
rt_sensor_t
sensor
=
(
rt_sensor_t
)
dev
;
rt_err_t
result
=
RT_EOK
;
rt_err_t
result
=
RT_EOK
;
RT_ASSERT
(
dev
!=
RT_NULL
);
RT_ASSERT
(
dev
!=
RT_NULL
);
rt_err_t
(
*
local_ctrl
)(
struct
rt_sensor_device
*
sensor
,
int
cmd
,
void
*
arg
)
=
local_control
;
rt_err_t
(
*
local_ctrl
)(
rt_sensor_t
sensor
,
int
cmd
,
void
*
arg
)
=
_
local_control
;
if
(
sensor
->
module
)
if
(
sensor
->
module
)
{
{
...
@@ -413,11 +409,11 @@ static rt_err_t rt_sensor_control(rt_device_t dev, int cmd, void *args)
...
@@ -413,11 +409,11 @@ static rt_err_t rt_sensor_control(rt_device_t dev, int cmd, void *args)
const
static
struct
rt_device_ops
rt_sensor_ops
=
const
static
struct
rt_device_ops
rt_sensor_ops
=
{
{
RT_NULL
,
RT_NULL
,
rt
_sensor_open
,
_sensor_open
,
rt
_sensor_close
,
_sensor_close
,
rt
_sensor_read
,
_sensor_read
,
RT_NULL
,
RT_NULL
,
rt
_sensor_control
_sensor_control
};
};
#endif
#endif
...
@@ -470,11 +466,11 @@ int rt_hw_sensor_register(rt_sensor_t sensor,
...
@@ -470,11 +466,11 @@ int rt_hw_sensor_register(rt_sensor_t sensor,
device
->
ops
=
&
rt_sensor_ops
;
device
->
ops
=
&
rt_sensor_ops
;
#else
#else
device
->
init
=
RT_NULL
;
device
->
init
=
RT_NULL
;
device
->
open
=
rt
_sensor_open
;
device
->
open
=
_sensor_open
;
device
->
close
=
rt
_sensor_close
;
device
->
close
=
_sensor_close
;
device
->
read
=
rt
_sensor_read
;
device
->
read
=
_sensor_read
;
device
->
write
=
RT_NULL
;
device
->
write
=
RT_NULL
;
device
->
control
=
rt
_sensor_control
;
device
->
control
=
_sensor_control
;
#endif
#endif
device
->
type
=
RT_Device_Class_Sensor
;
device
->
type
=
RT_Device_Class_Sensor
;
device
->
rx_indicate
=
RT_NULL
;
device
->
rx_indicate
=
RT_NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录