diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-10-03 14:18:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-10-03 14:18:56 +0000 |
| commit | 4b049c1f175144f8583df5eb9e3a620ac306ee98 (patch) | |
| tree | d20a3ec4de726fbfb746c6062061e24b7ac3d3be /demos | |
| parent | fe65d988275f509d3e7b71014c19c1d1aefac035 (diff) | |
| download | ChibiOS-4b049c1f175144f8583df5eb9e3a620ac306ee98.tar.gz ChibiOS-4b049c1f175144f8583df5eb9e3a620ac306ee98.tar.bz2 ChibiOS-4b049c1f175144f8583df5eb9e3a620ac306ee98.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6353 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/rt/RT-STM32F100-DISCOVERY/.project | 5 | ||||
| -rw-r--r-- | demos/rt/RT-STM32F100-DISCOVERY/Makefile | 2 | ||||
| -rw-r--r-- | demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.project | 5 | ||||
| -rw-r--r-- | demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile | 4 | ||||
| -rw-r--r-- | demos/rt/RT-STM32F103-OLIMEX_STM32_P103/main.c | 4 | ||||
| -rw-r--r-- | demos/rt/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h | 4 |
6 files changed, 17 insertions, 7 deletions
diff --git a/demos/rt/RT-STM32F100-DISCOVERY/.project b/demos/rt/RT-STM32F100-DISCOVERY/.project index a74e19975..8f8499917 100644 --- a/demos/rt/RT-STM32F100-DISCOVERY/.project +++ b/demos/rt/RT-STM32F100-DISCOVERY/.project @@ -86,5 +86,10 @@ <type>2</type>
<locationURI>CHIBIOS/os</locationURI>
</link>
+ <link>
+ <name>test</name>
+ <type>2</type>
+ <locationURI>CHIBIOS/test</locationURI>
+ </link>
</linkedResources>
</projectDescription>
diff --git a/demos/rt/RT-STM32F100-DISCOVERY/Makefile b/demos/rt/RT-STM32F100-DISCOVERY/Makefile index fdf18455d..f20ddb669 100644 --- a/demos/rt/RT-STM32F100-DISCOVERY/Makefile +++ b/demos/rt/RT-STM32F100-DISCOVERY/Makefile @@ -49,7 +49,7 @@ endif # Stack size to be allocated to the Cortex-M process stack. This stack is
# the stack used by the main() thread.
ifeq ($(USE_PROCESS_STACKSIZE),)
- USE_PROCESS_STACKSIZE = 0x100
+ USE_PROCESS_STACKSIZE = 0x400
endif
# Stack size to the allocated to the Cortex-M main/exceptions stack. This
diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.project b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.project index 55547da34..47b907a95 100644 --- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.project +++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/.project @@ -86,5 +86,10 @@ <type>2</type>
<locationURI>CHIBIOS/os</locationURI>
</link>
+ <link>
+ <name>test</name>
+ <type>2</type>
+ <locationURI>CHIBIOS/test</locationURI>
+ </link>
</linkedResources>
</projectDescription>
diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile index dc0ec1b0b..9b705c776 100644 --- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile +++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/Makefile @@ -5,7 +5,7 @@ # Compiler options here.
ifeq ($(USE_OPT),)
- USE_OPT = -O2 -ggdb -fomit-frame-pointer
+ USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
endif
# C specific options here (added to USE_OPT).
@@ -49,7 +49,7 @@ endif # Stack size to be allocated to the Cortex-M process stack. This stack is
# the stack used by the main() thread.
ifeq ($(USE_PROCESS_STACKSIZE),)
- USE_PROCESS_STACKSIZE = 0x100
+ USE_PROCESS_STACKSIZE = 0x400
endif
# Stack size to the allocated to the Cortex-M main/exceptions stack. This
diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/main.c b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/main.c index 0f9fb4b15..888d9d501 100644 --- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/main.c +++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/main.c @@ -54,7 +54,7 @@ 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);
+ sdStart(&SD2, NULL);
/*
* Creates the example thread.
@@ -68,7 +68,7 @@ int main(void) { */
while (TRUE) {
if (palReadPad(GPIOA, GPIOA_BUTTON))
- TestThread(&SD1);
+ TestThread(&SD2);
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h index 382ef1ded..f29589eb4 100644 --- a/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h +++ b/demos/rt/RT-STM32F103-OLIMEX_STM32_P103/mcuconf.h @@ -150,8 +150,8 @@ /*
* SERIAL driver system settings.
*/
-#define STM32_SERIAL_USE_USART1 TRUE
-#define STM32_SERIAL_USE_USART2 FALSE
+#define STM32_SERIAL_USE_USART1 FALSE
+#define STM32_SERIAL_USE_USART2 TRUE
#define STM32_SERIAL_USE_USART3 FALSE
#define STM32_SERIAL_USE_UART4 FALSE
#define STM32_SERIAL_USE_UART5 FALSE
|