diff options
author | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-30 14:34:58 +0100 |
---|---|---|
committer | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-30 14:34:58 +0100 |
commit | 4435bdec242f1518ee0b4fcf93d8eec4341697e3 (patch) | |
tree | ad037b10cfca74926c6de7e2327807940af1d05d /demos/TIVA/RT-TM4C123G-LAUNCHPAD | |
parent | d10aa9e7a136e41377f40a774fdf3bffb59b358b (diff) | |
download | ChibiOS-Contrib-4435bdec242f1518ee0b4fcf93d8eec4341697e3.tar.gz ChibiOS-Contrib-4435bdec242f1518ee0b4fcf93d8eec4341697e3.tar.bz2 ChibiOS-Contrib-4435bdec242f1518ee0b4fcf93d8eec4341697e3.zip |
Replaced port+pad by line in the demos and testhal.
Diffstat (limited to 'demos/TIVA/RT-TM4C123G-LAUNCHPAD')
-rw-r--r-- | demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c index 6723c62..6522049 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c @@ -20,9 +20,8 @@ typedef struct led_config { - ioportid_t port; + ioportid_t line; uint32_t sleep; - uint8_t pin; } led_config_t; /* @@ -36,11 +35,11 @@ static THD_FUNCTION(blinkLed, arg) { chRegSetThreadName("Blinker"); - palSetPadMode(ledConfig->port, ledConfig->pin, PAL_MODE_OUTPUT_PUSHPULL); + palSetLineMode(ledConfig->line, PAL_MODE_OUTPUT_PUSHPULL); while (TRUE) { chThdSleepMilliseconds(ledConfig->sleep); - palTogglePad(ledConfig->port, ledConfig->pin); + palToggleLine(ledConfig->line); } } @@ -62,37 +61,43 @@ int main(void) 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)); + palSetLineMode(LINE_UART0_RX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1)); + palSetLineMode(LINE_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)) { + if (!palReadLine(LINE_SW2)) { test_execute((BaseSequentialStream *)&SD1); } - ledRed.port = GPIOF; - ledRed.pin = GPIOF_LED_RED; + ledRed.line = LINE_LED_RED; ledRed.sleep = 100; - ledGreen.port = GPIOF; - ledGreen.pin = GPIOF_LED_GREEN; + ledGreen.line = LINE_LED_GREEN; ledGreen.sleep = 101; - ledBlue.port = GPIOF; - ledBlue.pin = GPIOF_LED_BLUE; + ledBlue.line = LINE_LED_BLUE; ledBlue.sleep = 102; /* Creating the blinker threads.*/ - chThdCreateStatic(waBlinkLedRed, sizeof(waBlinkLedRed), NORMALPRIO, blinkLed, + chThdCreateStatic(waBlinkLedRed, + sizeof(waBlinkLedRed), + NORMALPRIO, + blinkLed, &ledRed); - chThdCreateStatic(waBlinkLedGreen, sizeof(waBlinkLedGreen), NORMALPRIO, - blinkLed, &ledGreen); - - chThdCreateStatic(waBlinkLedBlue, sizeof(waBlinkLedBlue), NORMALPRIO, - blinkLed, &ledBlue); + chThdCreateStatic(waBlinkLedGreen, + sizeof(waBlinkLedGreen), + NORMALPRIO, + blinkLed, + &ledGreen); + + chThdCreateStatic(waBlinkLedBlue, + sizeof(waBlinkLedBlue), + NORMALPRIO, + blinkLed, + &ledBlue); /* Normal main() thread activity.*/ while (TRUE) { |