mirror
/
micropython
kopia lustrzana https://github.com/micropython/micropython
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

stm32/adc: Use IS_CHANNEL_INTERNAL macro to check for internal channels.

pull/5221/head
iabdalkader 2019-10-11 22:36:58 +02:00 zatwierdzone przez Damien George
rodzic d523a377d1
commit 4cee42d864
1 zmienionych plików z 2 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
ports/stm32/adc.c
Wyświetl plik

@ -329,9 +329,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
#elif defined(STM32F4) || defined(STM32F7) #elif defined(STM32F4) || defined(STM32F7)
sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES; sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
#elif defined(STM32H7) #elif defined(STM32H7)
if (channel == ADC_CHANNEL_VREFINT if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
|| channel == ADC_CHANNEL_TEMPSENSOR
|| channel == ADC_CHANNEL_VBAT) {
sConfig.SamplingTime = ADC_SAMPLETIME_387CYCLES_5; sConfig.SamplingTime = ADC_SAMPLETIME_387CYCLES_5;
} else { } else {
sConfig.SamplingTime = ADC_SAMPLETIME_8CYCLES_5; sConfig.SamplingTime = ADC_SAMPLETIME_8CYCLES_5;
@ -341,9 +339,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
sConfig.OffsetRightShift = DISABLE; sConfig.OffsetRightShift = DISABLE;
sConfig.OffsetSignedSaturation = DISABLE; sConfig.OffsetSignedSaturation = DISABLE;
#elif defined(STM32L4) #elif defined(STM32L4)
if (channel == ADC_CHANNEL_VREFINT if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
|| channel == ADC_CHANNEL_TEMPSENSOR
|| channel == ADC_CHANNEL_VBAT) {
sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5; sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
} else { } else {
sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5; sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;