Merge remote-tracking branch 'origin/master' into develop

4 years ago · 10fa737ab8
parent a7c403fb09 88a22268eb
commit 10fa737ab8
2 changed files with 3 additions and 1 deletions
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@ -91,7 +91,7 @@ void set_layer_color(int layer) {
 }

 void rgb_matrix_indicators_user(void) {
-    if (g_suspend_state || keyboard_config.disable_layer_led) {
+    if (keyboard_config.disable_layer_led) {
        return;
    }
    switch (biton32(layer_state)) {
--- a/keyboards/planck/keymaps/oryx/rules.mk
+++ b/keyboards/planck/keymaps/oryx/rules.mk
@ -3,5 +3,7 @@
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 MOUSEKEY_ENABLE = no
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
 WEBUSB_ENABLE = yes
 ORYX_ENABLE = yes