From 8961aeb168630dc0d83ae45fd7cc4768070dd4d8 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 26 Jan 2016 23:38:14 -0800 Subject: [PATCH] make leds_setup match naming pins_setup --- KeyboardConfig.cpp | 2 +- KeyboardConfig.h | 2 +- KeyboardioFirmware.ino | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/KeyboardConfig.cpp b/KeyboardConfig.cpp index 32cb6434..265da234 100644 --- a/KeyboardConfig.cpp +++ b/KeyboardConfig.cpp @@ -13,7 +13,7 @@ static int left_initted = 0; WS2812 LED(LED_COUNT); -void implementation_setup_leds() { +void implementation_leds_setup() { LED.setOutput(LED_DATA_PIN); LED.setColorOrderGRB(); // Uncomment for RGB color order } diff --git a/KeyboardConfig.h b/KeyboardConfig.h index 43d8959d..9bc128da 100644 --- a/KeyboardConfig.h +++ b/KeyboardConfig.h @@ -50,7 +50,7 @@ static const uint8_t key_led_map[4][16] = { }; -void implementation_setup_leds(); +void implementation_leds_setup(); void implementation_led_set_crgb_at(byte row, byte col, cRGB color); diff --git a/KeyboardioFirmware.ino b/KeyboardioFirmware.ino index ff3ece19..5dad67ef 100644 --- a/KeyboardioFirmware.ino +++ b/KeyboardioFirmware.ino @@ -33,7 +33,7 @@ void setup() { wdt_disable(); Keyboard.begin(); Mouse.begin(); - implementation_setup_leds(); + implementation_leds_setup(); LEDs.led_bootup(); implementation_pins_setup(); @@ -102,6 +102,7 @@ void handle_key_event(byte row, byte col) { byte switchState = matrixState[row][col]; Key mappedKey = keymaps[temporary_keymap][row][col]; + if (keymaps[primary_keymap][row][col].flags & SWITCH_TO_KEYMAP) { handle_keymap_key_event(switchState, keymaps[primary_keymap][row][col]); }