From c6d7c1f7dc04820eaa5fbfef6f29fb8d79b2b1ff Mon Sep 17 00:00:00 2001
From: marcoveeneman <marco-veeneman@hotmail.com>
Date: Tue, 3 Mar 2015 23:07:15 +0100
Subject: Adapted the RT-TM4C123G-LAUNCHPAD and RT-TM4C1294-LAUNCHPAD demos to
 configure the used pins at runtime and moved the TestThread execution before
 the blink threads are started.

---
 demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c | 48 ++++++++++++++-------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

(limited to 'demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c')

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
index bb6e963..0a64adb 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
@@ -37,6 +37,8 @@ static msg_t blinkLed(void *arg)
 
   chRegSetThreadName("Blinker");
 
+  palSetPadMode(ledConfig->port, ledConfig->pin, PAL_MODE_OUTPUT_PUSHPULL);
+
   while (TRUE) {
     chThdSleepMilliseconds(ledConfig->sleep);
     palTogglePad(ledConfig->port, ledConfig->pin);
@@ -62,6 +64,17 @@ int main(void)
   halInit();
   chSysInit();
 
+  /* Configure RX and TX pins for UART0.*/
+  palSetPadMode(GPIOA, GPIOA_UART0_RX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
+  palSetPadMode(GPIOA, GPIOA_UART0_TX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
+
+  /* Start the serial driver with the default configuration.*/
+  sdStart(&SD1, NULL);
+
+  if (!palReadPad(GPIOF, GPIOF_SW2)) {
+    TestThread(&SD1);
+  }
+
   ledRed.port    = GPIOF;
   ledRed.pin     = GPIOF_LED_RED;
   ledRed.sleep   = 100;
@@ -74,39 +87,18 @@ int main(void)
   ledBlue.pin    = GPIOF_LED_BLUE;
   ledBlue.sleep  = 102;
 
-  /*
-   * Creating the blinker threads.
-   */
-  chThdCreateStatic(waBlinkLedRed,
-                    sizeof(waBlinkLedRed),
-                    NORMALPRIO,
-                    blinkLed,
+  /* Creating the blinker threads.*/
+  chThdCreateStatic(waBlinkLedRed, sizeof(waBlinkLedRed), NORMALPRIO, blinkLed,
                     &ledRed);
 
-  chThdCreateStatic(waBlinkLedGreen,
-                    sizeof(waBlinkLedGreen),
-                    NORMALPRIO,
-                    blinkLed,
-                    &ledGreen);
+  chThdCreateStatic(waBlinkLedGreen, sizeof(waBlinkLedGreen), NORMALPRIO,
+                    blinkLed, &ledGreen);
 
-  chThdCreateStatic(waBlinkLedBlue,
-                    sizeof(waBlinkLedBlue),
-                    NORMALPRIO,
-                    blinkLed,
-                    &ledBlue);
+  chThdCreateStatic(waBlinkLedBlue, sizeof(waBlinkLedBlue), NORMALPRIO,
+                    blinkLed, &ledBlue);
 
-  /*
-   * Start the serial driver with the default configuration.
-   */
-  sdStart(&SD1, NULL);
-
-  /*
-   * Normal main() thread activity
-   */
+  /* Normal main() thread activity.*/
   while (TRUE) {
-    if (!palReadPad(GPIOF, GPIOF_SW2)) {
-      TestThread(&SD1);
-    }
     chThdSleepMilliseconds(100);
   }
   
-- 
cgit v1.2.3