From 27b7c4ec048316bfc1ec82638ddc6ecb412fffe0 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 11 Dec 2010 08:54:40 +0000 Subject: Implemented CR on the STM32 ADC driver. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2467 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/adc_lld.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'os') diff --git a/os/hal/platforms/STM32/adc_lld.c b/os/hal/platforms/STM32/adc_lld.c index ae983e7bf..1a9069c59 100644 --- a/os/hal/platforms/STM32/adc_lld.c +++ b/os/hal/platforms/STM32/adc_lld.c @@ -203,16 +203,16 @@ void adc_lld_start_conversion(ADCDriver *adcp) { dmaChannelSetup(adcp->ad_dmachp, n, adcp->ad_samples, ccr); /* ADC setup.*/ + adcp->ad_adc->CR1 = grpp->acg_cr1 | ADC_CR1_SCAN; + adcp->ad_adc->CR2 = grpp->acg_cr2 | ADC_CR2_DMA | ADC_CR2_ADON; adcp->ad_adc->SMPR1 = grpp->acg_smpr1; adcp->ad_adc->SMPR2 = grpp->acg_smpr2; adcp->ad_adc->SQR1 = grpp->acg_sqr1; adcp->ad_adc->SQR2 = grpp->acg_sqr2; adcp->ad_adc->SQR3 = grpp->acg_sqr3; - adcp->ad_adc->CR1 = grpp->acg_cr1 | ADC_CR1_SCAN; - adcp->ad_adc->CR2 = grpp->acg_cr2 | ADC_CR2_DMA | ADC_CR2_ADON; - /* ADC start.*/ - adcp->ad_adc->CR2 |= ADC_CR2_SWSTART | ADC_CR2_EXTTRIG; + /* ADC start by writing ADC_CR2_ADON a second time.*/ + adcp->ad_adc->CR2 = grpp->acg_cr2 | ADC_CR2_DMA | ADC_CR2_ADON; } /** -- cgit v1.2.3