diff options
author | a_p_u_r_o <applause@elfmimi.jp> | 2020-10-07 11:30:43 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-07 13:30:43 +1100 |
commit | bc79e5199071472f3d728826f381abf8cca59456 (patch) | |
tree | 0cc183afb7dea6d00ed50019c8000a561642bb72 /quantum/process_keycode | |
parent | a67b32425b792fd9d891356f66aa39bd7319d823 (diff) | |
download | qmk_firmware-bc79e5199071472f3d728826f381abf8cca59456.tar.gz qmk_firmware-bc79e5199071472f3d728826f381abf8cca59456.zip |
Fix issue introduced by PR#10404 (#10559)
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r-- | quantum/process_keycode/process_rgb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c index e0c62465f..5dd8e7809 100644 --- a/quantum/process_keycode/process_rgb.c +++ b/quantum/process_keycode/process_rgb.c | |||
@@ -23,7 +23,7 @@ typedef void (*rgb_func_pointer)(void); | |||
23 | * | 23 | * |
24 | * noinline to optimise for firmware size not speed (not in hot path) | 24 | * noinline to optimise for firmware size not speed (not in hot path) |
25 | */ | 25 | */ |
26 | #if !(defined(RGBLIGHT_DISABLE_KEYCODES) || defined(RGB_MATRIX_DISABLE_KEYCODES)) | 26 | #if (defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)) || (defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)) |
27 | static void __attribute__((noinline)) handleKeycodeRGB(const uint8_t is_shifted, const rgb_func_pointer inc_func, const rgb_func_pointer dec_func) { | 27 | static void __attribute__((noinline)) handleKeycodeRGB(const uint8_t is_shifted, const rgb_func_pointer inc_func, const rgb_func_pointer dec_func) { |
28 | if (is_shifted) { | 28 | if (is_shifted) { |
29 | dec_func(); | 29 | dec_func(); |
@@ -58,7 +58,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) { | |||
58 | // Split keyboards need to trigger on key-up for edge-case issue | 58 | // Split keyboards need to trigger on key-up for edge-case issue |
59 | if (!record->event.pressed) { | 59 | if (!record->event.pressed) { |
60 | #endif | 60 | #endif |
61 | #if !(defined(RGBLIGHT_DISABLE_KEYCODES) || defined(RGB_MATRIX_DISABLE_KEYCODES)) | 61 | #if (defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)) || (defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)) |
62 | uint8_t shifted = get_mods() & MOD_MASK_SHIFT; | 62 | uint8_t shifted = get_mods() & MOD_MASK_SHIFT; |
63 | #endif | 63 | #endif |
64 | switch (keycode) { | 64 | switch (keycode) { |