TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

stm32/machine_adc: Fix internal ADC channel reading on WB MCUs.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-06-25 14:25:46 +10:00
parent c9adabc25a
commit d5246cea61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ports/stm32/machine_adc.c
View File

@@ -386,6 +386,7 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
*smpr = (*smpr & ~(7 << (channel * 3))) | sample_time << (channel * 3); // select sample time *smpr = (*smpr & ~(7 << (channel * 3))) | sample_time << (channel * 3); // select sample time
#elif defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) #elif defined(STM32G4) || defined(STM32H5) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
#if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ) #if defined(STM32G4) || defined(STM32H5) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
ADC_Common_TypeDef *adc_common = ADC12_COMMON; ADC_Common_TypeDef *adc_common = ADC12_COMMON;
#elif defined(STM32H7) #elif defined(STM32H7)
@@ -423,8 +424,8 @@ static void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
adc->OR |= ADC_OR_OP0; // Enable Vddcore channel on ADC2 adc->OR |= ADC_OR_OP0; // Enable Vddcore channel on ADC2
#endif #endif
} }
#if defined(STM32G4) || defined(STM32H5) #if defined(STM32G4) || defined(STM32H5) || defined(STM32WB)
// G4 and H5 use encoded literals for internal channels -> extract ADC channel for following code // MCU uses encoded literals for internal channels -> extract ADC channel for following code
if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) { if (__LL_ADC_IS_CHANNEL_INTERNAL(channel)) {
channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel); channel = __LL_ADC_CHANNEL_TO_DECIMAL_NB(channel);
} }