diff options
| author | Joel Challis <git@zvecr.com> | 2019-10-31 05:30:21 +0000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-10-30 22:30:21 -0700 |
| commit | 22812aee5c207c35010c4b5478af6039c4f2b1ef (patch) | |
| tree | bd5380af904a75807cb665671b26a8d510a84110 /tmk_core | |
| parent | bd55396a45338b82bf8f26afa05b054c1079286d (diff) | |
| download | qmk_firmware-22812aee5c207c35010c4b5478af6039c4f2b1ef.tar.gz qmk_firmware-22812aee5c207c35010c4b5478af6039c4f2b1ef.zip | |
rgblight_task logic fixes (#7214)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 4 | ||||
| -rw-r--r-- | tmk_core/protocol/vusb/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 12a6924fd..eb166c828 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
| @@ -78,7 +78,7 @@ extern keymap_config_t keymap_config; | |||
| 78 | # include "virtser.h" | 78 | # include "virtser.h" |
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| 81 | #if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE) | 81 | #if (defined(RGB_MIDI) || defined(RGBLIGHT_ANIMATIONS)) && defined(RGBLIGHT_ENABLE) |
| 82 | # include "rgblight.h" | 82 | # include "rgblight.h" |
| 83 | #endif | 83 | #endif |
| 84 | 84 | ||
| @@ -1001,7 +1001,7 @@ int main(void) { | |||
| 1001 | MIDI_Device_USBTask(&USB_MIDI_Interface); | 1001 | MIDI_Device_USBTask(&USB_MIDI_Interface); |
| 1002 | #endif | 1002 | #endif |
| 1003 | 1003 | ||
| 1004 | #if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE) | 1004 | #if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE) |
| 1005 | rgblight_task(); | 1005 | rgblight_task(); |
| 1006 | #endif | 1006 | #endif |
| 1007 | 1007 | ||
diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c index 8cc736497..e6291900e 100644 --- a/tmk_core/protocol/vusb/main.c +++ b/tmk_core/protocol/vusb/main.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include "debug.h" | 22 | #include "debug.h" |
| 23 | #include "rgblight_reconfig.h" | 23 | #include "rgblight_reconfig.h" |
| 24 | 24 | ||
| 25 | #if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE) | 25 | #if (defined(RGB_MIDI) || defined(RGBLIGHT_ANIMATIONS)) && defined(RGBLIGHT_ENABLE) |
| 26 | # include "rgblight.h" | 26 | # include "rgblight.h" |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||