summaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/lufa.c
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-10-31 05:30:21 +0000
committerFlorian Didron <fdidron@users.noreply.github.com>2020-01-09 08:57:11 +0900
commit72f42d8e52445127d1ddac39ebbd4ab80ed4b5d2 (patch)
tree150c86af8226b66f4e9ce8a1484b21b2c28ee1be /tmk_core/protocol/lufa/lufa.c
parent50c6d1e178d7d250ccc728f8da4b61f98e201d3a (diff)
rgblight_task logic fixes (#7214)
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r--tmk_core/protocol/lufa/lufa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index a6ac44c597..0124f8a7bd 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
@@ -1115,7 +1115,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