aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-11-24 17:58:27 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-11-24 17:58:27 +0000
commit46870077b874696c09704da37dc4c33c8eb21402 (patch)
tree83bb86cc7e257025e0787f80b4e6d09e917926bf /demos
parent5a74dd3c2e3aa7c2a72f1bfe69a39b047710c429 (diff)
downloadChibiOS-46870077b874696c09704da37dc4c33c8eb21402.tar.gz
ChibiOS-46870077b874696c09704da37dc4c33c8eb21402.tar.bz2
ChibiOS-46870077b874696c09704da37dc4c33c8eb21402.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3523 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/ARMCM3-STM32L152-DISCOVERY/main.c4
-rw-r--r--demos/ARMCM3-STM32L152-DISCOVERY/mcuconf.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/main.c b/demos/ARMCM3-STM32L152-DISCOVERY/main.c
index 3b538854f..7eb3815fc 100644
--- a/demos/ARMCM3-STM32L152-DISCOVERY/main.c
+++ b/demos/ARMCM3-STM32L152-DISCOVERY/main.c
@@ -49,8 +49,8 @@ static const ADCConversionGroup adcgrpcfg = {
adccb,
NULL,
/* HW dependent part.*/
- 0,
- 0,
+ 0, /* CR1 */
+ ADC_CR2_SWSTART, /* CR2 */
0,
ADC_SMPR2_SMP_AN10(ADC_SAMPLE_48) | ADC_SMPR2_SMP_SENSOR(ADC_SAMPLE_192),
0,
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/mcuconf.h b/demos/ARMCM3-STM32L152-DISCOVERY/mcuconf.h
index b29e6a6fa..ab26b77a3 100644
--- a/demos/ARMCM3-STM32L152-DISCOVERY/mcuconf.h
+++ b/demos/ARMCM3-STM32L152-DISCOVERY/mcuconf.h
@@ -61,7 +61,8 @@
*/
#define STM32_ADC_USE_ADC1 TRUE
#define STM32_ADC_ADC1_DMA_PRIORITY 2
-#define STM32_ADC_ADC1_IRQ_PRIORITY 5
+#define STM32_ADC_IRQ_PRIORITY 5
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 5
/*
* CAN driver system settings.