From 70309bef3d47916f1b988aacc2fac598bd1f9d22 Mon Sep 17 00:00:00 2001 From: yiancar Date: Sat, 11 Jan 2020 17:25:27 +0000 Subject: [PATCH] [Keyboard] NK65 Refactor (#7862) * Nk65 Refractor - Changed Via keymap to via instead of default_via - Moved Caps/Layer indicator code outside of wilba_tech rgb. This is so they can more easily be modified * Update keyboards/nk65/nk65.c --- .../keymaps/{default_via => via}/keymap.c | 0 .../keymaps/{default_via => via}/readme.md | 0 .../keymaps/{default_via => via}/rules.mk | 0 keyboards/nk65/nk65.c | 42 +++++++++++++++++-- keyboards/wilba_tech/wt_rgb_backlight.c | 16 ------- 5 files changed, 39 insertions(+), 19 deletions(-) rename keyboards/nk65/keymaps/{default_via => via}/keymap.c (100%) rename keyboards/nk65/keymaps/{default_via => via}/readme.md (100%) rename keyboards/nk65/keymaps/{default_via => via}/rules.mk (100%) diff --git a/keyboards/nk65/keymaps/default_via/keymap.c b/keyboards/nk65/keymaps/via/keymap.c similarity index 100% rename from keyboards/nk65/keymaps/default_via/keymap.c rename to keyboards/nk65/keymaps/via/keymap.c diff --git a/keyboards/nk65/keymaps/default_via/readme.md b/keyboards/nk65/keymaps/via/readme.md similarity index 100% rename from keyboards/nk65/keymaps/default_via/readme.md rename to keyboards/nk65/keymaps/via/readme.md diff --git a/keyboards/nk65/keymaps/default_via/rules.mk b/keyboards/nk65/keymaps/via/rules.mk similarity index 100% rename from keyboards/nk65/keymaps/default_via/rules.mk rename to keyboards/nk65/keymaps/via/rules.mk diff --git a/keyboards/nk65/nk65.c b/keyboards/nk65/nk65.c index 495246218..972373e1b 100755 --- a/keyboards/nk65/nk65.c +++ b/keyboards/nk65/nk65.c @@ -13,6 +13,42 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #ifndef RGB_BACKLIGHT_NK65 - #error RGB_BACKLIGHT_NK65 not defined, recheck config.h - #endif +#ifndef RGB_BACKLIGHT_NK65 +#error RGB_BACKLIGHT_NK65 not defined, recheck config.h +#endif + +#include "nk65.h" +#include "drivers/issi/is31fl3733.h" + +/* Indicator LEDS are part of the LED driver + * Top LED is blue only. LED driver 2 RGB 7 Green channel + * Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel + * Bottom LED is red only LED driver 2 RGB 6 Green channel. + */ +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if(res) { + if (led_state.caps_lock) { + IS31FL3733_set_color( 7+64-1, 0, 255, 0 ); + } else { + IS31FL3733_set_color( 7+64-1, 0, 0, 0 ); + } + } + return res; +} + +__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { + uint8_t R = 0; + uint8_t G = 0; + uint8_t B = 0; + if (state & (1UL << 1)) { + R = 255; + B = 255; + } + if (state & (1UL << 2)) { + G = 255; + } + + IS31FL3733_set_color( 6+64-1, R, G, B ); + return state; +} diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index 31cfabddd..1ca3117fb 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -1551,22 +1551,6 @@ void backlight_effect_indicators(void) { backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color ); } - -#if defined(RGB_BACKLIGHT_NK65) - if ( IS_LED_ON(g_indicator_state, USB_LED_CAPS_LOCK) ) { - IS31FL3733_set_color( 7+64-1, 0, 255, 0 ); - } else { - IS31FL3733_set_color( 7+64-1, 0, 0, 0 ); - } - if ( IS_LAYER_ON(1) ) { - IS31FL3733_set_color( 6+64-1, 255, 0, 255 ); - } else if ( IS_LAYER_ON(2) ) { - IS31FL3733_set_color( 6+64-1, 0, 255, 0 ); - } else { - IS31FL3733_set_color( 6+64-1, 0, 0, 0 ); - } -#endif - // This if/else if structure allows higher layers to // override lower ones. If we set layer 3's indicator // to none, then it will NOT show layer 2 or layer 1