Merge branch 'tiva_pal_driver'

6 files changed, 47 insertions, 18 deletions

diff --git a/testhal/TIVA/TM4C123x/GPT/main.c b/testhal/TIVA/TM4C123x/GPT/main.c
index 416c1ae..c365186 100644
--- a/testhal/TIVA/TM4C123x/GPT/main.c
+++ b/testhal/TIVA/TM4C123x/GPT/main.c
@@ -71,6 +71,8 @@ int main(void)
   halInit();
   chSysInit();
 
+  palSetPadMode(GPIOF, GPIOF_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
+
   /*
    * Start the gpt drivers with the custom configurations.
    */
diff --git a/testhal/TIVA/TM4C123x/GPT/mcuconf.h b/testhal/TIVA/TM4C123x/GPT/mcuconf.h
index 326bee8..86dc969 100644
--- a/testhal/TIVA/TM4C123x/GPT/mcuconf.h
+++ b/testhal/TIVA/TM4C123x/GPT/mcuconf.h
@@ -25,6 +25,16 @@
                                              TIVA_RCC_PWMDIV_8)
 
 /*
+ * GPIO driver system settings.
+ */
+#define TIVA_GPIO_GPIOA_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOB_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOC_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOD_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOE_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOF_USE_AHB             TRUE
+
+/*
  * GPT driver system settings.
  */
 #define TIVA_GPT_USE_GPT0                   TRUE
diff --git a/testhal/TIVA/TM4C123x/I2C/main.c b/testhal/TIVA/TM4C123x/I2C/main.c
index a48c7f1..5bdfeb2 100644
--- a/testhal/TIVA/TM4C123x/I2C/main.c
+++ b/testhal/TIVA/TM4C123x/I2C/main.c
@@ -69,11 +69,19 @@ 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);
 
+  /* Configure SCK and SCL pins for I2C0.*/
+  palSetPadMode(GPIOB, GPIOB_I2C0_SCL, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(3));
+  palSetPadMode(GPIOB, GPIOB_I2C0_SDA, PAL_MODE_OUTPUT_OPENDRAIN | PAL_MODE_ALTERNATE(3));
+
   /*
    * Start the i2c driver with the custom configuration.
    */
diff --git a/testhal/TIVA/TM4C123x/I2C/mcuconf.h b/testhal/TIVA/TM4C123x/I2C/mcuconf.h
index 1a51171..cbb493e 100644
--- a/testhal/TIVA/TM4C123x/I2C/mcuconf.h
+++ b/testhal/TIVA/TM4C123x/I2C/mcuconf.h
@@ -25,6 +25,16 @@
                                              TIVA_RCC_PWMDIV_8)
 
 /*
+ * GPIO driver system settings.
+ */
+#define TIVA_GPIO_GPIOA_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOB_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOC_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOD_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOE_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOF_USE_AHB             TRUE
+
+/*
  * GPT driver system settings.
  */
 #define TIVA_GPT_USE_GPT0                   FALSE
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);
       }
diff --git a/testhal/TIVA/TM4C123x/PWM/mcuconf.h b/testhal/TIVA/TM4C123x/PWM/mcuconf.h
index 9327c5b..f3d87de 100644
--- a/testhal/TIVA/TM4C123x/PWM/mcuconf.h
+++ b/testhal/TIVA/TM4C123x/PWM/mcuconf.h
@@ -25,6 +25,16 @@
                                              TIVA_RCC_PWMDIV_8)
 
 /*
+ * GPIO driver system settings.
+ */
+#define TIVA_GPIO_GPIOA_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOB_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOC_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOD_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOE_USE_AHB             TRUE
+#define TIVA_GPIO_GPIOF_USE_AHB             TRUE
+
+/*
  * GPT driver system settings.
  */
 #define TIVA_GPT_USE_GPT0                   FALSE