summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriabdalkader <i.abdalkader@gmail.com>2019-10-11 22:27:13 +0200
committerDamien George <damien.p.george@gmail.com>2019-10-15 22:04:19 +1100
commitd523a377d17e667f760c2c64dc3a41dafe072ebc (patch)
treed658f6f58b86f4100ba4823fbf4e14788793dca8
parentcb2b210d45194f2578189ca5b0ec4c8b8fc96810 (diff)
stm32/adc: Remove unused macro and channel check, and fix spacing.
The call to is_adcx_channel is redundant because the channel is already checked just before calling adc_init_single in adc_make_new.
-rw-r--r--ports/stm32/adc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index de4b910cb..ace6505a3 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -63,7 +63,6 @@
#endif
#define ADCx_CLK_ENABLE __HAL_RCC_ADC1_CLK_ENABLE
-#define ADC_NUM_CHANNELS (19)
#if defined(STM32F0)
@@ -293,9 +292,6 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
}
STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
- if (!is_adcx_channel(adc_obj->channel)) {
- return;
- }
if (ADC_FIRST_GPIO_CHANNEL <= adc_obj->channel && adc_obj->channel <= ADC_LAST_GPIO_CHANNEL) {
// Channels 0-16 correspond to real pins. Configure the GPIO pin in ADC mode.
@@ -731,7 +727,7 @@ int adc_get_resolution(ADC_HandleTypeDef *adcHandle) {
uint32_t res_reg = ADC_GET_RESOLUTION(adcHandle);
switch (res_reg) {
- #if !defined(STM32H7)
+ #if !defined(STM32H7)
case ADC_RESOLUTION_6B: return 6;
#endif
case ADC_RESOLUTION_8B: return 8;