From 2b01d72e42576594924aa12fe50571cd56cafbb5 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 27 May 2012 13:42:33 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4242
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 testhal/STM32F0xx/ADC/main.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'testhal/STM32F0xx/ADC/main.c')

diff --git a/testhal/STM32F0xx/ADC/main.c b/testhal/STM32F0xx/ADC/main.c
index dba3a5254..6038a2fb2 100644
--- a/testhal/STM32F0xx/ADC/main.c
+++ b/testhal/STM32F0xx/ADC/main.c
@@ -24,7 +24,7 @@
 #define ADC_GRP1_NUM_CHANNELS   1
 #define ADC_GRP1_BUF_DEPTH      8
 
-#define ADC_GRP2_NUM_CHANNELS   8
+#define ADC_GRP2_NUM_CHANNELS   4
 #define ADC_GRP2_BUF_DEPTH      16
 
 static adcsample_t samples1[ADC_GRP1_NUM_CHANNELS * ADC_GRP1_BUF_DEPTH];
@@ -61,24 +61,25 @@ static const ADCConversionGroup adcgrpcfg1 = {
   ADC_GRP1_NUM_CHANNELS,
   NULL,
   adcerrorcallback,
-  0,                        /* CFGRR1 */
-  0,                        /* SMPR */
-  0                         /* CHSELR */
+  ADC_CFGR1_RES_12BIT,      /* CFGRR1 */
+  ADC_SMPR_SMP_1P5,         /* SMPR */
+  ADC_CHSELR_CHSEL10        /* CHSELR */
 };
 
 /*
  * ADC conversion group.
  * Mode:        Continuous, 16 samples of 8 channels, SW triggered.
- * Channels:    IN10, IN11, IN10, IN11, IN10, IN11, Sensor, VRef.
+ * Channels:    IN10, IN11, Sensor, VRef.
  */
 static const ADCConversionGroup adcgrpcfg2 = {
   TRUE,
   ADC_GRP2_NUM_CHANNELS,
   adccallback,
   adcerrorcallback,
-  0,                        /* CFGRR1 */
-  0,                        /* SMPR */
-  0                         /* CHSELR */
+  ADC_CFGR1_RES_12BIT,                              /* CFGRR1 */
+  ADC_SMPR_SMP_28P5,                                /* SMPR */
+  ADC_CHSELR_CHSEL10 | ADC_CHSELR_CHSEL11 |
+  ADC_CHSELR_CHSEL16 | ADC_CHSELR_CHSEL17           /* CHSELR */
 };
 
 /*
-- 
cgit v1.2.3