diff options
| author | Bernard Xiong <[email protected]> | 2020-03-22 21:25:56 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-22 21:25:56 +0800 |
| commit | a8cd463347f71d931d65323b9e42d359a8d216db (patch) | |
| tree | 473359ebd99b98831a90489f6086816e4da0e9d6 | |
| parent | 2e42ad82795490835e38373f473e735471dbaef4 (diff) | |
| parent | d211a27aff98181a765118c3777d42e378123e7c (diff) | |
Merge pull request #3470 from Sunwancn/fix-adc-channel-bug
[drv_adc.c]Fixed ADC channel configuration bug for SMT32F0/L0/H7
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/drv_adc.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_adc.c b/bsp/stm32/libraries/HAL_Drivers/drv_adc.c index 97ddc4d818..825cd11f36 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_adc.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_adc.c @@ -122,17 +122,24 @@ static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel) case 15: stm32_channel = ADC_CHANNEL_15; break; +#ifdef ADC_CHANNEL_16 case 16: stm32_channel = ADC_CHANNEL_16; break; +#endif case 17: stm32_channel = ADC_CHANNEL_17; break; -#if defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32L4) +#ifdef ADC_CHANNEL_18 case 18: stm32_channel = ADC_CHANNEL_18; break; #endif +#ifdef ADC_CHANNEL_19 + case 19: + stm32_channel = ADC_CHANNEL_19; + break; +#endif } return stm32_channel; @@ -150,10 +157,22 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch rt_memset(&ADC_ChanConf, 0, sizeof(ADC_ChanConf)); -#if defined(SOC_SERIES_STM32F1) +#ifndef ADC_CHANNEL_16 + if (channel == 16) + { + LOG_E("ADC channel must not be 16."); + return -RT_ERROR; + } +#endif + +/* ADC channel number is up to 17 */ +#if !defined(ADC_CHANNEL_18) if (channel <= 17) -#elif defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) \ - || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32G0) +/* ADC channel number is up to 19 */ +#elif defined(ADC_CHANNEL_19) + if (channel <= 19) +/* ADC channel number is up to 18 */ +#else if (channel <= 18) #endif { @@ -162,10 +181,11 @@ static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t ch } else { -#if defined(SOC_SERIES_STM32F1) +#if !defined(ADC_CHANNEL_18) LOG_E("ADC channel must be between 0 and 17."); -#elif defined(SOC_SERIES_STM32F0) || defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) \ - || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32G0) +#elif defined(ADC_CHANNEL_19) + LOG_E("ADC channel must be between 0 and 19."); +#else LOG_E("ADC channel must be between 0 and 18."); #endif return -RT_ERROR; |