From 32b5484b3127d911936e19c4d18331704e3ae6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sat, 15 Oct 2016 00:41:37 +0200 Subject: [PATCH] Fix TEST_LED_{ON,OFF} macros to function as they should. Enable the test LEDs of both halves by default. --- left/src/main.c | 1 - left/src/test_led.c | 1 + left/src/test_led.h | 4 ++-- right/src/test_led.c | 4 +++- right/src/test_led.h | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/left/src/main.c b/left/src/main.c index a6f489d..c380f5d 100644 --- a/left/src/main.c +++ b/left/src/main.c @@ -72,7 +72,6 @@ int main(void) // while (!g_SlaveCompletionFlag) {} // g_SlaveCompletionFlag = false; - TEST_LED_OFF(); KeyMatrix_Init(&keyMatrix); while (1) { KeyMatrix_Scan(&keyMatrix); diff --git a/left/src/test_led.c b/left/src/test_led.c index 8f536ff..449735a 100644 --- a/left/src/test_led.c +++ b/left/src/test_led.c @@ -6,4 +6,5 @@ extern void InitTestLed() CLOCK_EnableClock(TEST_LED_CLOCK); PORT_SetPinMux(TEST_LED_PORT, TEST_LED_PIN, kPORT_MuxAsGpio); GPIO_PinInit(TEST_LED_GPIO, TEST_LED_PIN, &(gpio_pin_config_t){kGPIO_DigitalOutput, 0}); + TEST_LED_ON(); } diff --git a/left/src/test_led.h b/left/src/test_led.h index dd5f024..01e71cc 100644 --- a/left/src/test_led.h +++ b/left/src/test_led.h @@ -15,8 +15,8 @@ #define TEST_LED_CLOCK kCLOCK_PortA #define TEST_LED_PIN 12 - #define TEST_LED_ON() GPIO_ClearPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN) - #define TEST_LED_OFF() GPIO_SetPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN) + #define TEST_LED_ON() GPIO_SetPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN) + #define TEST_LED_OFF() GPIO_ClearPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_PIN) #define TEST_LED_TOGGLE() GPIO_TogglePinsOutput(TEST_LED_GPIO, 1U << TEST_LED_GPIO_PIN) // Functions: diff --git a/right/src/test_led.c b/right/src/test_led.c index 04ce612..e382140 100644 --- a/right/src/test_led.c +++ b/right/src/test_led.c @@ -5,5 +5,7 @@ extern void InitTestLed() { CLOCK_EnableClock(TEST_LED_CLOCK); PORT_SetPinMux(TEST_LED_GPIO_PORT, TEST_LED_GPIO_PIN, kPORT_MuxAsGpio); - GPIO_PinInit(TEST_LED_GPIO, TEST_LED_GPIO_PIN, &(gpio_pin_config_t){kGPIO_DigitalOutput, 0}); + GPIO_PinInit(TEST_LED_GPIO, TEST_LED_GPIO_PIN, &(gpio_pin_config_t){kGPIO_DigitalOutput, 1}); + TEST_LED_ON(); } + diff --git a/right/src/test_led.h b/right/src/test_led.h index 75d9880..d3ed491 100644 --- a/right/src/test_led.h +++ b/right/src/test_led.h @@ -15,8 +15,8 @@ #define TEST_LED_CLOCK kCLOCK_PortD #define TEST_LED_GPIO_PIN 7U - #define TEST_LED_ON() GPIO_ClearPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_GPIO_PIN) - #define TEST_LED_OFF() GPIO_SetPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_GPIO_PIN) + #define TEST_LED_ON() GPIO_SetPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_GPIO_PIN) + #define TEST_LED_OFF() GPIO_ClearPinsOutput(TEST_LED_GPIO, 1U << TEST_LED_GPIO_PIN) #define TEST_LED_TOGGLE() GPIO_TogglePinsOutput(TEST_LED_GPIO, 1U << TEST_LED_GPIO_PIN) // Functions: