Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
c2a09955
R
rt-thread
项目概览
wwsmg1
/
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,发现更多精彩内容 >>
未验证
提交
c2a09955
编写于
4月 22, 2022
作者:
mysterywolf
提交者:
GitHub
4月 22, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[adc] 支持adc框架获取BSP的ADC分辨率 (#5853)
上级
b06228ec
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
9 deletion
+43
-9
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
+26
-2
components/drivers/include/drivers/adc.h
components/drivers/include/drivers/adc.h
+2
-0
components/drivers/misc/adc.c
components/drivers/misc/adc.c
+15
-7
未找到文件。
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
浏览文件 @
c2a09955
...
...
@@ -70,6 +70,29 @@ static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chan
return
RT_EOK
;
}
static
rt_uint8_t
stm32_adc_get_resolution
(
struct
rt_adc_device
*
device
)
{
ADC_HandleTypeDef
*
stm32_adc_handler
;
RT_ASSERT
(
device
!=
RT_NULL
);
stm32_adc_handler
=
device
->
parent
.
user_data
;
switch
(
stm32_adc_handler
->
Init
.
Resolution
)
{
case
ADC_RESOLUTION_12B
:
return
12
;
case
ADC_RESOLUTION_10B
:
return
10
;
case
ADC_RESOLUTION_8B
:
return
8
;
case
ADC_RESOLUTION_6B
:
return
6
;
default:
return
0
;
}
}
static
rt_uint32_t
stm32_adc_get_channel
(
rt_uint32_t
channel
)
{
rt_uint32_t
stm32_channel
=
0
;
...
...
@@ -147,7 +170,7 @@ static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel)
return
stm32_channel
;
}
static
rt_err_t
stm32_
get_adc
_value
(
struct
rt_adc_device
*
device
,
rt_uint32_t
channel
,
rt_uint32_t
*
value
)
static
rt_err_t
stm32_
adc_get
_value
(
struct
rt_adc_device
*
device
,
rt_uint32_t
channel
,
rt_uint32_t
*
value
)
{
ADC_ChannelConfTypeDef
ADC_ChanConf
;
ADC_HandleTypeDef
*
stm32_adc_handler
;
...
...
@@ -260,7 +283,8 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch
static
const
struct
rt_adc_ops
stm_adc_ops
=
{
.
enabled
=
stm32_adc_enabled
,
.
convert
=
stm32_get_adc_value
,
.
convert
=
stm32_adc_get_value
,
.
get_resolution
=
stm32_adc_get_resolution
,
};
static
int
stm32_adc_init
(
void
)
...
...
components/drivers/include/drivers/adc.h
浏览文件 @
c2a09955
...
...
@@ -18,6 +18,7 @@ struct rt_adc_ops
{
rt_err_t
(
*
enabled
)(
struct
rt_adc_device
*
device
,
rt_uint32_t
channel
,
rt_bool_t
enabled
);
rt_err_t
(
*
convert
)(
struct
rt_adc_device
*
device
,
rt_uint32_t
channel
,
rt_uint32_t
*
value
);
rt_uint8_t
(
*
get_resolution
)(
struct
rt_adc_device
*
device
);
};
struct
rt_adc_device
...
...
@@ -31,6 +32,7 @@ typedef enum
{
RT_ADC_CMD_ENABLE
=
RT_DEVICE_CTRL_BASE
(
ADC
)
+
1
,
RT_ADC_CMD_DISABLE
=
RT_DEVICE_CTRL_BASE
(
ADC
)
+
2
,
RT_ADC_CMD_GET_RESOLUTION
=
RT_DEVICE_CTRL_BASE
(
ADC
)
+
3
,
}
rt_adc_cmd_t
;
rt_err_t
rt_hw_adc_register
(
rt_adc_device_t
adc
,
const
char
*
name
,
const
struct
rt_adc_ops
*
ops
,
const
void
*
user_data
);
...
...
components/drivers/misc/adc.c
浏览文件 @
c2a09955
...
...
@@ -41,21 +41,27 @@ static rt_size_t _adc_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_
static
rt_err_t
_adc_control
(
rt_device_t
dev
,
int
cmd
,
void
*
args
)
{
rt_err_t
result
=
RT_EOK
;
rt_err_t
result
=
-
RT_EINVAL
;
rt_adc_device_t
adc
=
(
struct
rt_adc_device
*
)
dev
;
if
(
adc
->
ops
->
enabled
==
RT_NULL
)
{
return
-
RT_ENOSYS
;
}
if
(
cmd
==
RT_ADC_CMD_ENABLE
)
if
(
cmd
==
RT_ADC_CMD_ENABLE
&&
adc
->
ops
->
enabled
)
{
result
=
adc
->
ops
->
enabled
(
adc
,
(
rt_uint32_t
)
args
,
RT_TRUE
);
}
else
if
(
cmd
==
RT_ADC_CMD_DISABLE
)
else
if
(
cmd
==
RT_ADC_CMD_DISABLE
&&
adc
->
ops
->
enabled
)
{
result
=
adc
->
ops
->
enabled
(
adc
,
(
rt_uint32_t
)
args
,
RT_FALSE
);
}
else
if
(
cmd
==
RT_ADC_CMD_GET_RESOLUTION
&&
adc
->
ops
->
get_resolution
)
{
rt_uint8_t
resolution
=
adc
->
ops
->
get_resolution
(
adc
);
if
(
resolution
!=
0
)
{
*
((
rt_uint8_t
*
)
args
)
=
resolution
;
LOG_D
(
"ADC resolution:%d"
,
resolution
);
result
=
RT_EOK
;
}
}
return
result
;
}
...
...
@@ -115,6 +121,7 @@ rt_err_t rt_adc_enable(rt_adc_device_t dev, rt_uint32_t channel)
rt_err_t
result
=
RT_EOK
;
RT_ASSERT
(
dev
);
if
(
dev
->
ops
->
enabled
!=
RT_NULL
)
{
result
=
dev
->
ops
->
enabled
(
dev
,
channel
,
RT_TRUE
);
...
...
@@ -132,6 +139,7 @@ rt_err_t rt_adc_disable(rt_adc_device_t dev, rt_uint32_t channel)
rt_err_t
result
=
RT_EOK
;
RT_ASSERT
(
dev
);
if
(
dev
->
ops
->
enabled
!=
RT_NULL
)
{
result
=
dev
->
ops
->
enabled
(
dev
,
channel
,
RT_FALSE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录