From 2c928f2833afa53ec045adafb39d85b84685a2d8 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 29 Sep 2013 10:39:31 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6330 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- testhal/STM32F37x/SDADC/.project | 2 +- testhal/STM32F37x/SDADC/main.c | 5 +++-- testhal/STM32F37x/SDADC/mcuconf.h | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'testhal/STM32F37x/SDADC') diff --git a/testhal/STM32F37x/SDADC/.project b/testhal/STM32F37x/SDADC/.project index 83a87eb03..72cfb92b9 100644 --- a/testhal/STM32F37x/SDADC/.project +++ b/testhal/STM32F37x/SDADC/.project @@ -27,7 +27,7 @@ board 2 - CHIBIOS/boards/ST_STM32373C_EVAL + CHIBIOS/os/hal/boards/ST_STM32373C_EVAL os diff --git a/testhal/STM32F37x/SDADC/main.c b/testhal/STM32F37x/SDADC/main.c index 1d700a3a5..6d5bd4383 100644 --- a/testhal/STM32F37x/SDADC/main.c +++ b/testhal/STM32F37x/SDADC/main.c @@ -102,10 +102,11 @@ static const ADCConversionGroup adcgrpcfg2 = { /* * Red LEDs blinker thread, times are in milliseconds. */ -static WORKING_AREA(waThread1, 128); -static msg_t Thread1(void *arg) { +static THD_WORKING_AREA(waThread1, 128); +static THD_FUNCTION(Thread1, arg) { (void)arg; + chRegSetThreadName("blinker"); while (TRUE) { palClearPad(GPIOC, GPIOC_LED1); diff --git a/testhal/STM32F37x/SDADC/mcuconf.h b/testhal/STM32F37x/SDADC/mcuconf.h index f2e3e3def..9f383d592 100644 --- a/testhal/STM32F37x/SDADC/mcuconf.h +++ b/testhal/STM32F37x/SDADC/mcuconf.h @@ -63,9 +63,9 @@ * ADC driver system settings. */ #define STM32_ADC_USE_ADC1 TRUE -#define STM32_ADC_USE_SDADC1 FALSE -#define STM32_ADC_USE_SDADC2 FALSE -#define STM32_ADC_USE_SDADC3 FALSE +#define STM32_ADC_USE_SDADC1 TRUE +#define STM32_ADC_USE_SDADC2 TRUE +#define STM32_ADC_USE_SDADC3 TRUE #define STM32_ADC_ADC1_DMA_PRIORITY 2 #define STM32_ADC_SDADC1_DMA_PRIORITY 2 #define STM32_ADC_SDADC2_DMA_PRIORITY 2 @@ -81,7 +81,7 @@ /* * CAN driver system settings. */ -#define STM32_CAN_USE_CAN1 TRUE +#define STM32_CAN_USE_CAN1 FALSE #define STM32_CAN_CAN1_IRQ_PRIORITY 11 /* -- cgit v1.2.3