diff options
| author | Damien George <damien@micropython.org> | 2025-06-25 14:24:21 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-07-08 13:14:48 +1000 |
| commit | 841439d5fb285a748acb0bdfa8c0cac7af7b10a7 (patch) | |
| tree | f4e02e1c48a46fa28b10339112118bd6b133670c /ports/stm32/adc.c | |
| parent | ea2000b81d2007e373a302d5361455147c693dbb (diff) | |
stm32/adc: Simplify ADC calibration settings.
Combine the common settings for L1/L4/WB with existing G0/G4/H5 settings.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'ports/stm32/adc.c')
| -rw-r--r-- | ports/stm32/adc.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c index 239175bac..34c52f489 100644 --- a/ports/stm32/adc.c +++ b/ports/stm32/adc.c @@ -107,12 +107,12 @@ #define ADC_CAL2 ((uint16_t *)(ADC_CAL_ADDRESS + 4)) #define ADC_CAL_BITS (12) -#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) +#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) #define ADC_SCALE_V (((float)VREFINT_CAL_VREF) / 1000.0f) -#define ADC_CAL_ADDRESS VREFINT_CAL_ADDR -#define ADC_CAL1 TEMPSENSOR_CAL1_ADDR -#define ADC_CAL2 TEMPSENSOR_CAL2_ADDR +#define ADC_CAL_ADDRESS (VREFINT_CAL_ADDR) +#define ADC_CAL1 (TEMPSENSOR_CAL1_ADDR) +#define ADC_CAL2 (TEMPSENSOR_CAL2_ADDR) #define ADC_CAL_BITS (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits' #elif defined(STM32H7) @@ -123,22 +123,6 @@ #define ADC_CAL2 ((uint16_t *)(0x1FF1E840)) #define ADC_CAL_BITS (16) -#elif defined(STM32L1) - -#define ADC_SCALE_V (VREFINT_CAL_VREF / 1000.0f) -#define ADC_CAL_ADDRESS (VREFINT_CAL_ADDR) -#define ADC_CAL1 (TEMPSENSOR_CAL1_ADDR) -#define ADC_CAL2 (TEMPSENSOR_CAL2_ADDR) -#define ADC_CAL_BITS (12) - -#elif defined(STM32L4) || defined(STM32WB) - -#define ADC_SCALE_V (VREFINT_CAL_VREF / 1000.0f) -#define ADC_CAL_ADDRESS (VREFINT_CAL_ADDR) -#define ADC_CAL1 (TEMPSENSOR_CAL1_ADDR) -#define ADC_CAL2 (TEMPSENSOR_CAL2_ADDR) -#define ADC_CAL_BITS (12) - #else #error Unsupported processor |