summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-02-06 04:58:43 +0000
committerQMK Bot <hello@qmk.fm>2022-02-06 04:58:43 +0000
commit10fa737ab879fea7cdb03b393d1efbcb28a4a12f (patch)
tree15afa63ccd0dbea2cd9f6e776ffea208ef8c9260
parenta7c403fb09ff7faa31cf78ab4c96ad0c78fee96e (diff)
parent88a22268eb3f932b485f524dadc52c93163ae839 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/planck/keymaps/oryx/keymap.c2
-rw-r--r--keyboards/planck/keymaps/oryx/rules.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index e84b9913a8..0368c98420 100644
--- 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)) {
diff --git a/keyboards/planck/keymaps/oryx/rules.mk b/keyboards/planck/keymaps/oryx/rules.mk
index 1e29b5f218..5f561b32e1 100644
--- 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