diff options
| author | Yuuki NAGAO <wf.yn386@gmail.com> | 2025-07-05 22:32:04 +0900 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-10-24 23:53:16 +1100 |
| commit | dbcfec7df87184392737288ee685beb8637f0e52 (patch) | |
| tree | 3baabe69b79733f0b9eadab1a2717a0e5d58b41f | |
| parent | 842657a0b8bc1e5dd6ca6542e979432742260afa (diff) | |
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 <wf.yn386@gmail.com>
| -rw-r--r-- | ports/stm32/adc.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c index c912d9df3..27f6c5c23 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 |