diff options
| author |  yiancar <yiangosyiangou@cytanet.com.cy> | 2019-10-08 17:03:51 +0100 |
|---|---|---|
| committer |  Drashna Jaelre <drashna@live.com> | 2019-10-08 09:03:51 -0700 |
| commit | 5e43f87956c36a609d49ab696c939f2547d076dc (patch) | |
| tree | 7a8e62fdf7822e3d950801513631a7fea0fed2bd /keyboards | |
| parent | d00326ecb3f7e3b6703f9f0656c1f5a917da086b (diff) | |
| download | qmk_firmware-5e43f87956c36a609d49ab696c939f2547d076dc.tar.gz | |
[Keyboard] RGB updates on NK65 and HS60 (#6795)
* RGB update commit
* Convert caps lock indicator check to IS_LED_ON
* ISSI3733 minor change
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/hs60/v2/config.h | 2 | ||||
| -rwxr-xr-x | keyboards/nk65/config.h | 2 | ||||
| -rw-r--r-- | keyboards/wilba_tech/wt_rgb_backlight.c | 14 |
3 files changed, 6 insertions, 12 deletions
diff --git a/keyboards/hs60/v2/config.h b/keyboards/hs60/v2/config.h index 57014993f..02df0074c 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 4358d9cf9..51e101cde 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 9116e98ba..ca8c3269f 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 ); |