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/protocol | |
| parent | bd55396a45338b82bf8f26afa05b054c1079286d (diff) | |
| download | firmware-22812aee5c207c35010c4b5478af6039c4f2b1ef.tar.gz firmware-22812aee5c207c35010c4b5478af6039c4f2b1ef.tar.bz2 firmware-22812aee5c207c35010c4b5478af6039c4f2b1ef.zip | |
rgblight_task logic fixes (#7214)
Diffstat (limited to 'tmk_core/protocol')
| -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; # include "virtser.h" #endif -#if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE) +#if (defined(RGB_MIDI) || defined(RGBLIGHT_ANIMATIONS)) && defined(RGBLIGHT_ENABLE) # include "rgblight.h" #endif @@ -1001,7 +1001,7 @@ int main(void) { MIDI_Device_USBTask(&USB_MIDI_Interface); #endif -#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE) +#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE) rgblight_task(); #endif 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 @@ #include "debug.h" #include "rgblight_reconfig.h" -#if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE) +#if (defined(RGB_MIDI) || defined(RGBLIGHT_ANIMATIONS)) && defined(RGBLIGHT_ENABLE) # include "rgblight.h" #endif |