From 53a30f78fe3e5ebebc379f1f3ab0ef92448ac349 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Mon, 14 Dec 2015 14:38:16 +0000 Subject: STM32F3 now uses the shared ADCv3 driver. There are differences in the configuration structure. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8599 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- testhal/STM32/STM32F3xx/ADC/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testhal/STM32/STM32F3xx/ADC/main.c') diff --git a/testhal/STM32/STM32F3xx/ADC/main.c b/testhal/STM32/STM32F3xx/ADC/main.c index 0686becb7..f9b371602 100644 --- a/testhal/STM32/STM32F3xx/ADC/main.c +++ b/testhal/STM32/STM32F3xx/ADC/main.c @@ -59,7 +59,6 @@ static const ADCConversionGroup adcgrpcfg1 = { adcerrorcallback, ADC_CFGR_CONT, /* CFGR */ ADC_TR(0, 4095), /* TR1 */ - 0, /* CCR */ { /* SMPR[2] */ 0, 0 @@ -84,7 +83,6 @@ static const ADCConversionGroup adcgrpcfg2 = { adcerrorcallback, ADC_CFGR_CONT, /* CFGR */ ADC_TR(0, 4095), /* TR1 */ - ADC_CCR_TSEN | ADC_CCR_VBATEN, /* CCR */ { /* SMPR[2] */ ADC_SMPR1_SMP_AN7(ADC_SMPR_SMP_19P5) | ADC_SMPR1_SMP_AN8(ADC_SMPR_SMP_19P5), @@ -147,6 +145,8 @@ int main(void) { * Activates the ADC1 driver and the temperature sensor. */ adcStart(&ADCD1, NULL); + adcSTM32EnableTS(&ADCD1); + adcSTM32EnableVBAT(&ADCD1); /* * Linear conversion. -- cgit v1.2.3