From deefca97da3072fc52ce2a591a8bc647f7e28d09 Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Fri, 30 Dec 2016 15:58:18 +0000 Subject: [PATCH] Fixed Bug #807 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@10001 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/ADCv3/adc_lld.c | 7 +++++++ readme.txt | 1 + 2 files changed, 8 insertions(+) diff --git a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c index 289b3067d..a83ccb695 100644 --- a/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c +++ b/os/hal/ports/STM32/LLD/ADCv3/adc_lld.c @@ -546,7 +546,14 @@ void adc_lld_init(void) { #if defined(STM32L4XX) rccEnableADC123(FALSE); rccResetADC123(); + +#if defined(ADC1_2_COMMON) + ADC1_2_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA; +#elif defined(ADC123_COMMON) ADC123_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA; +#else + ADC1_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA; +#endif rccDisableADC123(FALSE); #endif } diff --git a/readme.txt b/readme.txt index e43c07dc4..46a055d5f 100644 --- a/readme.txt +++ b/readme.txt @@ -73,6 +73,7 @@ ***************************************************************************** *** 16.1.6 *** +- HAL: Fixed wrong initialization in ADC lld v3 (bug #807). - HAL: Fixed wrong clock init in STM32F0 port ad added more error checks (bug #806). - HAL: Fixed misplaced else in STM32F0 port (bug #805).