From 5e43f87956c36a609d49ab696c939f2547d076dc Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Tue, 8 Oct 2019 17:03:51 +0100
Subject: [PATCH] [Keyboard] RGB updates on NK65 and HS60 (#6795)
* RGB update commit
* Convert caps lock indicator check to IS_LED_ON
* ISSI3733 minor change
---
drivers/issi/is31fl3733.c | 3 ++-
keyboards/hs60/v2/config.h | 2 +-
keyboards/nk65/config.h | 2 +-
keyboards/wilba_tech/wt_rgb_backlight.c | 14 ++++----------
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/issi/is31fl3733.c b/drivers/issi/is31fl3733.c
index 968f072de8..cc2d895efd 100644
--- a/drivers/issi/is31fl3733.c
+++ b/drivers/issi/is31fl3733.c
@@ -231,5 +231,6 @@ void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index) {
IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
}
}
- g_led_control_registers_update_required[index] = false;
+ // This seems counter intuitive but sometimes this page can get corrupted. So update it every time.
+ // g_led_control_registers_update_required[index] = false;
}
diff --git a/keyboards/hs60/v2/config.h b/keyboards/hs60/v2/config.h
index 57014993f4..02df0074cc 100644
--- a/keyboards/hs60/v2/config.h
+++ b/keyboards/hs60/v2/config.h
@@ -106,7 +106,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_BACKLIGHT_BRIGHTNESS 255
// the default effect (RGB test)
-#define RGB_BACKLIGHT_EFFECT 255
+#define RGB_BACKLIGHT_EFFECT 6
// the default effect speed (0-3)
#define RGB_BACKLIGHT_EFFECT_SPEED 0
diff --git a/keyboards/nk65/config.h b/keyboards/nk65/config.h
index 4358d9cf95..51e101cde5 100755
--- a/keyboards/nk65/config.h
+++ b/keyboards/nk65/config.h
@@ -106,7 +106,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_BACKLIGHT_BRIGHTNESS 255
// the default effect (RGB test)
-#define RGB_BACKLIGHT_EFFECT 255
+#define RGB_BACKLIGHT_EFFECT 6
// the default effect speed (0-3)
#define RGB_BACKLIGHT_EFFECT_SPEED 0
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 9116e98ba7..ca8c3269f6 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -791,7 +791,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
{208,255}, {39,255}, {23,238}, {235,255}, {235,255}, {33,255}, {19,255}, {255,233}, {224,255}, {160,255}, {164,255}, {169,255}, {188,255},
{255,255},// LA61 does not exit, dummy
//LA62..LB5
- {221,255}, {225,255}, {229,255}, {22,255}, {12,255}, {244,255}, {234,255}, {255,255},
+ {221,255}, {225,255}, {229,255}, {22,255}, {12,255}, {244,255}, {234,255}, {255,255}
};
#elif defined(RGB_BACKLIGHT_M6_B)
// M6-B is really simple:
@@ -1551,20 +1551,14 @@ void backlight_effect_indicators(void)
}
#if defined(RGB_BACKLIGHT_NK65)
- if ( g_indicator_state & (1<<USB_LED_CAPS_LOCK) )
- {
+ 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 ( g_indicator_state & (1<<USB_LED_SCROLL_LOCK) )
- {
+ if ( IS_LAYER_ON(1) ) {
IS31FL3733_set_color( 6+64-1, 255, 0, 255 );
- } else {
- IS31FL3733_set_color( 6+64-1, 0, 0, 0 );
- }
- if ( g_indicator_state & (1<<USB_LED_NUM_LOCK) )
- {
+ } 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 );