From dbcfec7df87184392737288ee685beb8637f0e52 Mon Sep 17 00:00:00 2001 From: Yuuki NAGAO Date: Sat, 5 Jul 2025 22:32:04 +0900 Subject: [PATCH] stm32/adc: Use macros defined by HAL for H7. For STM32H7, the following macro's value are different by ADC's version: * ADC_CAL_ADDRESS * ADC_CAL1 * TEMPSENSOR_CAL2_ADDR Using macros defined by HAL become less dependent on ADC's version. Signed-off-by: Yuuki NAGAO --- ports/stm32/adc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c index c912d9df3a..27f6c5c233 100644 --- a/ports/stm32/adc.c +++ b/ports/stm32/adc.c @@ -107,21 +107,18 @@ #define ADC_CAL2 ((uint16_t *)(ADC_CAL_ADDRESS + 4)) #define ADC_CAL_BITS (12) -#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || defined(STM32WB) +#elif defined(STM32G0) || defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4) || defined(STM32N6) || 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_BITS (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits' -#elif defined(STM32H7) - -#define ADC_SCALE_V (3.3f) -#define ADC_CAL_ADDRESS (0x1FF1E860) -#define ADC_CAL1 ((uint16_t *)(0x1FF1E820)) -#define ADC_CAL2 ((uint16_t *)(0x1FF1E840)) +#if defined(STM32H7) #define ADC_CAL_BITS (16) +#else +#define ADC_CAL_BITS (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits' +#endif #else