From 3f7bad3c194247ac1b91b3120a48a4f6798cd1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 29 Feb 2016 15:25:47 +0100 Subject: [PATCH] Move LED initialization code to pin_mux.c --- right/composite.c | 14 -------------- right/include/board/pin_mux.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/right/composite.c b/right/composite.c index f393aed..10009ef 100644 --- a/right/composite.c +++ b/right/composite.c @@ -140,21 +140,7 @@ void main(void) BOARD_BootClockHSRUN(); BOARD_InitDebugConsole(); - gpio_pin_config_t led_config = { - kGPIO_DigitalOutput, 0, - }; - - // Init output LED GPIO. - GPIO_PinInit(BOARD_LED_RED_GPIO, BOARD_LED_RED_GPIO_PIN, &led_config); - GPIO_PinInit(BOARD_LED_GREEN_GPIO, BOARD_LED_GREEN_GPIO_PIN, &led_config); - GPIO_PinInit(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PIN, &led_config); - - GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1U << BOARD_LED_RED_GPIO_PIN); - GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN); - GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN); - USB_DeviceApplicationInit(); - while (1U) { } } diff --git a/right/include/board/pin_mux.c b/right/include/board/pin_mux.c index e824548..d4eea89 100644 --- a/right/include/board/pin_mux.c +++ b/right/include/board/pin_mux.c @@ -50,12 +50,24 @@ void BOARD_InitPins(void) CLOCK_EnableClock(kCLOCK_PortB); PORT_SetPinConfig(BOARD_SW3_PORT, BOARD_SW3_GPIO_PIN, &switchConfig); - // Enable LED port clock + // Init LEDs. + CLOCK_EnableClock(kCLOCK_PortA); CLOCK_EnableClock(kCLOCK_PortD); - // Led pin mux Configuration PORT_SetPinMux(BOARD_LED_RED_GPIO_PORT, BOARD_LED_RED_GPIO_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(BOARD_LED_GREEN_GPIO_PORT, BOARD_LED_GREEN_GPIO_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(BOARD_LED_BLUE_GPIO_PORT, BOARD_LED_BLUE_GPIO_PIN, kPORT_MuxAsGpio); + + gpio_pin_config_t led_config = { + kGPIO_DigitalOutput, 0, + }; + + GPIO_PinInit(BOARD_LED_RED_GPIO, BOARD_LED_RED_GPIO_PIN, &led_config); + GPIO_PinInit(BOARD_LED_GREEN_GPIO, BOARD_LED_GREEN_GPIO_PIN, &led_config); + GPIO_PinInit(BOARD_LED_BLUE_GPIO, BOARD_LED_BLUE_GPIO_PIN, &led_config); + + GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1U << BOARD_LED_RED_GPIO_PIN); + GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN); + GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN); }