diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-08-02 13:55:36 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-08-02 13:55:36 +1000 |
| commit | ee3c138385a2644b162807ef05261936858a7e25 (patch) | |
| tree | f7036343619a43c28250b12499dfc404cdc31a50 /keyboards/massdrop/ctrl | |
| parent | 26b62f7a6c4e5dd98e9a1e7b60c7e3a927e00ec2 (diff) | |
| parent | 4b630c46fed48f8a82641438029b628ec0dd5150 (diff) | |
| download | qmk_firmware-ee3c138385a2644b162807ef05261936858a7e25.tar.gz qmk_firmware-ee3c138385a2644b162807ef05261936858a7e25.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/massdrop/ctrl')
| -rw-r--r-- | keyboards/massdrop/ctrl/keymaps/endgame/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/massdrop/ctrl/keymaps/endgame/keymap.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c index c28434e06b..6451dd495b 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c @@ -373,7 +373,7 @@ void set_layer_color(int layer) { } void rgb_matrix_indicators_user(void) { - if (g_suspend_state || disable_layer_color || + if (disable_layer_color || rgb_matrix_get_flags() == LED_FLAG_NONE || rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) { return; diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h index 1a204311d4..2747681126 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h +++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h @@ -33,7 +33,6 @@ #define RGB_TIME_OUT_MIN 10 #define RGB_TIME_OUT_STEP 10 -extern bool g_suspend_state; extern rgb_config_t rgb_matrix_config; bool disable_layer_color; |