From 42add52912afc3f835fa66af279eda91b3d4bbc4 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Wed, 4 Mar 2015 20:32:05 +0100 Subject: Updated Tiva Testhal demos for GPT and PWM. --- testhal/TIVA/TM4C123x/PWM/main.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'testhal/TIVA/TM4C123x/PWM/main.c') diff --git a/testhal/TIVA/TM4C123x/PWM/main.c b/testhal/TIVA/TM4C123x/PWM/main.c index 252ad5e..b2b69d3 100644 --- a/testhal/TIVA/TM4C123x/PWM/main.c +++ b/testhal/TIVA/TM4C123x/PWM/main.c @@ -74,6 +74,10 @@ int main(void) halInit(); chSysInit(); + palSetPadMode(GPIOF, GPIOF_LED_RED, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOF, GPIOF_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOF, GPIOF_LED_BLUE, PAL_MODE_OUTPUT_PUSHPULL); + /* * Start PWM driver */ @@ -109,24 +113,9 @@ int main(void) rgbColour[decColour] -= 1; rgbColour[incColour] += 1; - if (!palReadPad(GPIOF, GPIOF_SW1)) - { - pwmEnableChannel(&PWMD1, 0, 0); - pwmEnableChannel(&PWMD1, 1, 1); - pwmEnableChannel(&PWMD1, 2, 2); - } - else if (!palReadPad(GPIOF, GPIOF_SW2)) - { - pwmEnableChannel(&PWMD1, 0, pwmcfg.frequency - 2); - pwmEnableChannel(&PWMD1, 1, pwmcfg.frequency - 1); - pwmEnableChannel(&PWMD1, 2, pwmcfg.frequency); - } - else - { - pwmEnableChannel(&PWMD1, 0, rgbColour[0]); - pwmEnableChannel(&PWMD1, 1, rgbColour[1]); - pwmEnableChannel(&PWMD1, 2, rgbColour[2]); - } + pwmEnableChannel(&PWMD1, 0, rgbColour[0]); + pwmEnableChannel(&PWMD1, 1, rgbColour[1]); + pwmEnableChannel(&PWMD1, 2, rgbColour[2]); chThdSleepMilliseconds(1); } -- cgit v1.2.3