From fa64f08fc1ad45d0984828695697f6abde7e8ffd Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 23 Jul 2013 13:51:02 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6024 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARMCM4-STM32F303-DISCOVERY/main.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'demos/ARMCM4-STM32F303-DISCOVERY/main.c') diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/main.c b/demos/ARMCM4-STM32F303-DISCOVERY/main.c index a72c1a72c..ed10165af 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/main.c +++ b/demos/ARMCM4-STM32F303-DISCOVERY/main.c @@ -18,6 +18,7 @@ #include "hal.h" #include "test.h" +#if 0 /* * This is a periodic thread that does absolutely nothing except flashing LEDs. */ @@ -53,6 +54,33 @@ static msg_t Thread1(void *arg) { palClearPad(GPIOE, GPIOE_LED4_BLUE); } } +#endif + +static WORKING_AREA(waThread1, 128); +static msg_t Thread1(void *arg) { + + (void)arg; + chRegSetThreadName("blinker1"); + while (TRUE) { + palSetPad(GPIOE, GPIOE_LED3_RED); + chThdSleepMilliseconds(250); + palClearPad(GPIOE, GPIOE_LED3_RED); + chThdSleepMilliseconds(250); + } +} + +static WORKING_AREA(waThread2, 128); +static msg_t Thread2(void *arg) { + + (void)arg; + chRegSetThreadName("blinker2"); + while (TRUE) { + palSetPad(GPIOE, GPIOE_LED4_BLUE); + chThdSleepMilliseconds(500); + palClearPad(GPIOE, GPIOE_LED4_BLUE); + chThdSleepMilliseconds(500); + } +} /* * Application entry point. @@ -80,7 +108,8 @@ int main(void) { /* * Creates the example thread. */ - chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL); + chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO+1, Thread1, NULL); + chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO+2, Thread2, NULL); /* * Normal main() thread activity, in this demo it does nothing except -- cgit v1.2.3 From e619097f77edeceb5e8c38dc7e614c7fccd36cbf Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 4 Aug 2013 13:38:53 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6073 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARMCM4-STM32F303-DISCOVERY/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'demos/ARMCM4-STM32F303-DISCOVERY/main.c') diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/main.c b/demos/ARMCM4-STM32F303-DISCOVERY/main.c index ed10165af..e12a55fda 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/main.c +++ b/demos/ARMCM4-STM32F303-DISCOVERY/main.c @@ -101,9 +101,9 @@ int main(void) { * Activates the serial driver 1 using the driver default configuration. * PA9(TX) and PA10(RX) are routed to USART1. */ - sdStart(&SD1, NULL); - palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7)); - palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7)); +// sdStart(&SD1, NULL); +// palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7)); +// palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7)); /* * Creates the example thread. @@ -117,8 +117,8 @@ int main(void) { * pressed the test procedure is launched. */ while (TRUE) { - if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); +// if (palReadPad(GPIOA, GPIOA_BUTTON)) +// TestThread(&SD1); chThdSleepMilliseconds(500); } } -- cgit v1.2.3 From 0ef4a97438fdcd3b1a26dbf258dbbaf2732358af Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 8 Aug 2013 12:22:21 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6104 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARMCM4-STM32F303-DISCOVERY/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'demos/ARMCM4-STM32F303-DISCOVERY/main.c') diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/main.c b/demos/ARMCM4-STM32F303-DISCOVERY/main.c index e12a55fda..ed10165af 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/main.c +++ b/demos/ARMCM4-STM32F303-DISCOVERY/main.c @@ -101,9 +101,9 @@ int main(void) { * Activates the serial driver 1 using the driver default configuration. * PA9(TX) and PA10(RX) are routed to USART1. */ -// sdStart(&SD1, NULL); -// palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7)); -// palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7)); + sdStart(&SD1, NULL); + palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7)); + palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7)); /* * Creates the example thread. @@ -117,8 +117,8 @@ int main(void) { * pressed the test procedure is launched. */ while (TRUE) { -// if (palReadPad(GPIOA, GPIOA_BUTTON)) -// TestThread(&SD1); + if (palReadPad(GPIOA, GPIOA_BUTTON)) + TestThread(&SD1); chThdSleepMilliseconds(500); } } -- cgit v1.2.3 From 004898e4d5f8a52148be18ad25842fab5a3b0160 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 1 Sep 2013 08:05:41 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6235 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARMCM4-STM32F303-DISCOVERY/main.c | 124 -------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 demos/ARMCM4-STM32F303-DISCOVERY/main.c (limited to 'demos/ARMCM4-STM32F303-DISCOVERY/main.c') diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/main.c b/demos/ARMCM4-STM32F303-DISCOVERY/main.c deleted file mode 100644 index ed10165af..000000000 --- a/demos/ARMCM4-STM32F303-DISCOVERY/main.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -#include "ch.h" -#include "hal.h" -#include "test.h" - -#if 0 -/* - * This is a periodic thread that does absolutely nothing except flashing LEDs. - */ -static WORKING_AREA(waThread1, 128); -static msg_t Thread1(void *arg) { - - (void)arg; - chRegSetThreadName("blinker"); - while (TRUE) { - palSetPad(GPIOE, GPIOE_LED3_RED); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED3_RED); - palSetPad(GPIOE, GPIOE_LED5_ORANGE); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED5_ORANGE); - palSetPad(GPIOE, GPIOE_LED7_GREEN); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED7_GREEN); - palSetPad(GPIOE, GPIOE_LED9_BLUE); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED9_BLUE); - palSetPad(GPIOE, GPIOE_LED10_RED); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED10_RED); - palSetPad(GPIOE, GPIOE_LED8_ORANGE); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED8_ORANGE); - palSetPad(GPIOE, GPIOE_LED6_GREEN); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED6_GREEN); - palSetPad(GPIOE, GPIOE_LED4_BLUE); - chThdSleepMilliseconds(125); - palClearPad(GPIOE, GPIOE_LED4_BLUE); - } -} -#endif - -static WORKING_AREA(waThread1, 128); -static msg_t Thread1(void *arg) { - - (void)arg; - chRegSetThreadName("blinker1"); - while (TRUE) { - palSetPad(GPIOE, GPIOE_LED3_RED); - chThdSleepMilliseconds(250); - palClearPad(GPIOE, GPIOE_LED3_RED); - chThdSleepMilliseconds(250); - } -} - -static WORKING_AREA(waThread2, 128); -static msg_t Thread2(void *arg) { - - (void)arg; - chRegSetThreadName("blinker2"); - while (TRUE) { - palSetPad(GPIOE, GPIOE_LED4_BLUE); - chThdSleepMilliseconds(500); - palClearPad(GPIOE, GPIOE_LED4_BLUE); - chThdSleepMilliseconds(500); - } -} - -/* - * Application entry point. - */ -int main(void) { - - /* - * System initializations. - * - HAL initialization, this also initializes the configured device drivers - * and performs the board-specific initializations. - * - Kernel initialization, the main() function becomes a thread and the - * RTOS is active. - */ - halInit(); - chSysInit(); - - /* - * Activates the serial driver 1 using the driver default configuration. - * PA9(TX) and PA10(RX) are routed to USART1. - */ - sdStart(&SD1, NULL); - palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7)); - palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7)); - - /* - * Creates the example thread. - */ - chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO+1, Thread1, NULL); - chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO+2, Thread2, NULL); - - /* - * Normal main() thread activity, in this demo it does nothing except - * sleeping in a loop and check the button state, when the button is - * pressed the test procedure is launched. - */ - while (TRUE) { - if (palReadPad(GPIOA, GPIOA_BUTTON)) - TestThread(&SD1); - chThdSleepMilliseconds(500); - } -} -- cgit v1.2.3