]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
rgblight_task logic fixes (#7214)
authorJoel Challis <git@zvecr.com>
Thu, 31 Oct 2019 05:30:21 +0000 (05:30 +0000)
committerDrashna Jaelre <drashna@live.com>
Thu, 31 Oct 2019 05:30:21 +0000 (22:30 -0700)
tmk_core/protocol/lufa/lufa.c
tmk_core/protocol/vusb/main.c

index 12a6924fd0043d9d03cd08797f13b05cc48e4fb6..eb166c828e519f2480d3d0c38ad1243c5feb442b 100644 (file)
@@ -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
 
index 8cc736497d7d1062b42dbed26bff49154e5345c5..e6291900e6c866d6883aa591a164509986824a63 100644 (file)
@@ -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