Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2345VOR
rt-thread
提交
c9f7f0e7
R
rt-thread
项目概览
2345VOR
/
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
c9f7f0e7
编写于
1月 17, 2023
作者:
Z
Zxy
提交者:
GitHub
1月 16, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[BSP][stm32] fix the compile error
上级
a2647aa3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
14 deletion
+41
-14
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
+41
-14
未找到文件。
bsp/stm32/libraries/HAL_Drivers/drv_adc.c
浏览文件 @
c9f7f0e7
...
@@ -67,23 +67,44 @@ static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chan
...
@@ -67,23 +67,44 @@ static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chan
/* ADC channel number is up to 17 */
/* ADC channel number is up to 17 */
#if !defined(ADC_CHANNEL_18)
#if !defined(ADC_CHANNEL_18)
if
(
channel
<=
17
||
\
if
(
channel
<=
17
||
(
(
channel
!=
(
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
)
||
\
#ifdef ADC_CHANNEL_VREFINT
channel
!=
(
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
)
||
\
channel
!=
(
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
)
channel
!=
(
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
)))
#endif
/* ADC_CHANNEL_VREFINT */
#ifdef ADC_CHANNEL_TEMPSENSOR
||
channel
!=
(
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
)
#endif
/* ADC_CHANNEL_TEMPSENSOR */
#ifdef ADC_CHANNEL_VBAT
||
channel
!=
(
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
)
#endif
/* ADC_CHANNEL_VBAT */
))
/* ADC channel number is up to 19 */
/* ADC channel number is up to 19 */
#elif defined(ADC_CHANNEL_19)
#elif defined(ADC_CHANNEL_19)
if
(
channel
<=
19
||
\
if
(
channel
<=
19
||
(
(
channel
!=
(
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
)
||
\
#ifdef ADC_CHANNEL_VREFINT
channel
!=
(
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
)
||
\
channel
!=
(
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
)
channel
!=
(
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
)))
#endif
/* ADC_CHANNEL_VREFINT */
#ifndef ADC_CHANNEL_TEMPSENSOR
||
channel
!=
(
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
)
#endif
/* ADC_CHANNEL_TEMPSENSOR */
#ifdef ADC_CHANNEL_VBAT
||
channel
!=
(
=
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
)
#endif
/* ADC_CHANNEL_VBAT */
))
/* ADC channel number is up to 18 */
/* ADC channel number is up to 18 */
#else
#else
if
(
channel
<=
18
||
\
if
(
channel
<=
18
||
(
(
channel
!=
(
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
)
||
\
#ifdef ADC_CHANNEL_VREFINT
channel
!=
(
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
)
||
\
channel
!=
(
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
)
channel
!=
(
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
)))
#endif
/* ADC_CHANNEL_VREFINT */
#endif
#ifdef ADC_CHANNEL_TEMPSENSOR
||
channel
!=
(
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
)
#endif
/* ADC_CHANNEL_TEMPSENSOR */
#ifdef ADC_CHANNEL_VBAT
||
channel
!=
(
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
)
#endif
/* ADC_CHANNEL_VBAT */
))
#endif
/* !defined(ADC_CHANNEL_18) */
{
{
/* set stm32 ADC channel */
/* set stm32 ADC channel */
ADC_ChanConf
.
Channel
=
stm32_adc_get_channel
(
channel
);
ADC_ChanConf
.
Channel
=
stm32_adc_get_channel
(
channel
);
...
@@ -96,7 +117,7 @@ static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chan
...
@@ -96,7 +117,7 @@ static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t chan
LOG_E
(
"ADC channel must be between 0 and 19."
);
LOG_E
(
"ADC channel must be between 0 and 19."
);
#else
#else
LOG_E
(
"ADC channel must be between 0 and 18."
);
LOG_E
(
"ADC channel must be between 0 and 18."
);
#endif
#endif
/* !defined(ADC_CHANNEL_18) */
return
-
RT_ERROR
;
return
-
RT_ERROR
;
}
}
...
@@ -273,15 +294,21 @@ static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel)
...
@@ -273,15 +294,21 @@ static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel)
default:
default:
switch
(
channel
)
switch
(
channel
)
{
{
#ifdef ADC_CHANNEL_VREFINT
case
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
:
case
ADC_CHANNEL_VREFINT
-
ADC_CHANNEL_0
:
stm32_channel
=
ADC_CHANNEL_VREFINT
;
stm32_channel
=
ADC_CHANNEL_VREFINT
;
break
;
break
;
#endif
/* ADC_CHANNEL_VREFINT */
#ifdef ADC_CHANNEL_VBAT
case
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
:
case
ADC_CHANNEL_VBAT
-
ADC_CHANNEL_0
:
stm32_channel
=
ADC_CHANNEL_VBAT
;
stm32_channel
=
ADC_CHANNEL_VBAT
;
break
;
break
;
#endif
/* ADC_CHANNEL_VBAT */
#ifdef ADC_CHANNEL_TEMPSENSOR
case
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
:
case
ADC_CHANNEL_TEMPSENSOR
-
ADC_CHANNEL_0
:
stm32_channel
=
ADC_CHANNEL_TEMPSENSOR
;
stm32_channel
=
ADC_CHANNEL_TEMPSENSOR
;
break
;
break
;
#endif
/* ADC_CHANNEL_TEMPSENSOR */
}
}
break
;
break
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录