git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7397 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 9 insertions, 7 deletions

diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile b/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile
index c1708eef9..7c47835a5 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/Makefile
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/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).

diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h b/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
index 6b29188af..6cb68e04f 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
@@ -332,7 +332,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_SYSTEM_STATE_CHECK           TRUE

+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE

 

 /**

  * @brief   Debug option, parameters checks.

@@ -341,7 +341,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_ENABLE_CHECKS                TRUE

+#define CH_DBG_ENABLE_CHECKS                FALSE

 

 /**

  * @brief   Debug option, consistency checks.

@@ -351,7 +351,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_ENABLE_ASSERTS               TRUE

+#define CH_DBG_ENABLE_ASSERTS               FALSE

 

 /**

  * @brief   Debug option, trace buffer.

@@ -372,7 +372,7 @@
  * @note    The default failure mode is to halt the system with the global

  *          @p panic_msg variable set to @p NULL.

  */

-#define CH_DBG_ENABLE_STACK_CHECK           TRUE

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

@@ -382,7 +382,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_FILL_THREADS                 TRUE

+#define CH_DBG_FILL_THREADS                 FALSE

 

 /**

  * @brief   Debug option, threads profiling.

diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/debug/RT-LPC214x-OLIMEX (OpenOCD, Flash and Run).launch b/demos/LPC21xx/RT-LPC214x-OLIMEX/debug/RT-LPC214x-OLIMEX (OpenOCD, Flash and Run).launch
index 4f46da0a9..8705f705f 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/debug/RT-LPC214x-OLIMEX (OpenOCD, Flash and Run).launch
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/debug/RT-LPC214x-OLIMEX (OpenOCD, Flash and Run).launch
@@ -33,7 +33,7 @@
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>

 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>

 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>

-<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;r0-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r3-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r4-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r6-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;cpsr-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;lr_abt-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>

+<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;lr_abt-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;cpsr-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r6-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r4-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r3-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r1-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;r0-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>

 <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>

 <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList/&gt;&#13;&#10;"/>

 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>

diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c
index 4b12ed6a6..65ce344c8 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/main.c
@@ -89,6 +89,8 @@ int main(void) {
    * sleeping in a loop and check the buttons state and run test procedure.

    */

   while (TRUE) {

+    if (!palReadPad(IOPORT1, PA_BUTTON1))

+      sdWrite(&SD1, (uint8_t *)"Hello World!\r\n", 14);

     if (!palReadPad(IOPORT1, PA_BUTTON2))

       TestThread(&SD1);

     chThdSleepMilliseconds(500);