summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoriabdalkader <i.abdalkader@gmail.com>2019-10-11 22:36:58 +0200
committerDamien George <damien.p.george@gmail.com>2019-10-15 22:08:36 +1100
commit4cee42d864eaabf40de6809ae76fcf20cd550a62 (patch)
tree283d8fe3135e5a2a4cd06eeaedb93ff4c053f875
parentd523a377d17e667f760c2c64dc3a41dafe072ebc (diff)
downloadmicropython-4cee42d864eaabf40de6809ae76fcf20cd550a62.tar.gz
micropython-4cee42d864eaabf40de6809ae76fcf20cd550a62.zip
stm32/adc: Use IS_CHANNEL_INTERNAL macro to check for internal channels.
-rw-r--r--ports/stm32/adc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index ace6505a3f..50abbebe15 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -329,9 +329,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
#elif defined(STM32F4) || defined(STM32F7)
sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
#elif defined(STM32H7)
- if (channel == ADC_CHANNEL_VREFINT
- || channel == ADC_CHANNEL_TEMPSENSOR
- || channel == ADC_CHANNEL_VBAT) {
+ if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
sConfig.SamplingTime = ADC_SAMPLETIME_387CYCLES_5;
} else {
sConfig.SamplingTime = ADC_SAMPLETIME_8CYCLES_5;
@@ -341,9 +339,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
sConfig.OffsetRightShift = DISABLE;
sConfig.OffsetSignedSaturation = DISABLE;
#elif defined(STM32L4)
- if (channel == ADC_CHANNEL_VREFINT
- || channel == ADC_CHANNEL_TEMPSENSOR
- || channel == ADC_CHANNEL_VBAT) {
+ if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
} else {
sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;