diff options
-rwxr-xr-x | keyboards/nk65/keymaps/via/keymap.c (renamed from keyboards/nk65/keymaps/default_via/keymap.c) | 0 | ||||
-rwxr-xr-x | keyboards/nk65/keymaps/via/readme.md (renamed from keyboards/nk65/keymaps/default_via/readme.md) | 0 | ||||
-rwxr-xr-x | keyboards/nk65/keymaps/via/rules.mk (renamed from keyboards/nk65/keymaps/default_via/rules.mk) | 0 | ||||
-rwxr-xr-x | keyboards/nk65/nk65.c | 42 | ||||
-rw-r--r-- | keyboards/wilba_tech/wt_rgb_backlight.c | 16 |
5 files changed, 39 insertions, 19 deletions
diff --git a/keyboards/nk65/keymaps/default_via/keymap.c b/keyboards/nk65/keymaps/via/keymap.c index a793a8bf4..a793a8bf4 100755 --- a/keyboards/nk65/keymaps/default_via/keymap.c +++ b/keyboards/nk65/keymaps/via/keymap.c | |||
diff --git a/keyboards/nk65/keymaps/default_via/readme.md b/keyboards/nk65/keymaps/via/readme.md index 6689191e4..6689191e4 100755 --- a/keyboards/nk65/keymaps/default_via/readme.md +++ b/keyboards/nk65/keymaps/via/readme.md | |||
diff --git a/keyboards/nk65/keymaps/default_via/rules.mk b/keyboards/nk65/keymaps/via/rules.mk index 1e5b99807..1e5b99807 100755 --- a/keyboards/nk65/keymaps/default_via/rules.mk +++ b/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 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | #ifndef RGB_BACKLIGHT_NK65 | 16 | #ifndef RGB_BACKLIGHT_NK65 |
17 | #error RGB_BACKLIGHT_NK65 not defined, recheck config.h | 17 | #error RGB_BACKLIGHT_NK65 not defined, recheck config.h |
18 | #endif | 18 | #endif |
19 | |||
20 | #include "nk65.h" | ||
21 | #include "drivers/issi/is31fl3733.h" | ||
22 | |||
23 | /* Indicator LEDS are part of the LED driver | ||
24 | * Top LED is blue only. LED driver 2 RGB 7 Green channel | ||
25 | * Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel | ||
26 | * Bottom LED is red only LED driver 2 RGB 6 Green channel. | ||
27 | */ | ||
28 | bool led_update_kb(led_t led_state) { | ||
29 | bool res = led_update_user(led_state); | ||
30 | if(res) { | ||
31 | if (led_state.caps_lock) { | ||
32 | IS31FL3733_set_color( 7+64-1, 0, 255, 0 ); | ||
33 | } else { | ||
34 | IS31FL3733_set_color( 7+64-1, 0, 0, 0 ); | ||
35 | } | ||
36 | } | ||
37 | return res; | ||
38 | } | ||
39 | |||
40 | __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { | ||
41 | uint8_t R = 0; | ||
42 | uint8_t G = 0; | ||
43 | uint8_t B = 0; | ||
44 | if (state & (1UL << 1)) { | ||
45 | R = 255; | ||
46 | B = 255; | ||
47 | } | ||
48 | if (state & (1UL << 2)) { | ||
49 | G = 255; | ||
50 | } | ||
51 | |||
52 | IS31FL3733_set_color( 6+64-1, R, G, B ); | ||
53 | return state; | ||
54 | } | ||
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) | |||
1551 | { | 1551 | { |
1552 | backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color ); | 1552 | backlight_effect_indicators_set_colors( g_config.caps_lock_indicator.index, g_config.caps_lock_indicator.color ); |
1553 | } | 1553 | } |
1554 | |||
1555 | #if defined(RGB_BACKLIGHT_NK65) | ||
1556 | if ( IS_LED_ON(g_indicator_state, USB_LED_CAPS_LOCK) ) { | ||
1557 | IS31FL3733_set_color( 7+64-1, 0, 255, 0 ); | ||
1558 | } else { | ||
1559 | IS31FL3733_set_color( 7+64-1, 0, 0, 0 ); | ||
1560 | } | ||
1561 | if ( IS_LAYER_ON(1) ) { | ||
1562 | IS31FL3733_set_color( 6+64-1, 255, 0, 255 ); | ||
1563 | } else if ( IS_LAYER_ON(2) ) { | ||
1564 | IS31FL3733_set_color( 6+64-1, 0, 255, 0 ); | ||
1565 | } else { | ||
1566 | IS31FL3733_set_color( 6+64-1, 0, 0, 0 ); | ||
1567 | } | ||
1568 | #endif | ||
1569 | |||
1570 | // This if/else if structure allows higher layers to | 1554 | // This if/else if structure allows higher layers to |
1571 | // override lower ones. If we set layer 3's indicator | 1555 | // override lower ones. If we set layer 3's indicator |
1572 | // to none, then it will NOT show layer 2 or layer 1 | 1556 | // to none, then it will NOT show layer 2 or layer 1 |