Selaa lähdekoodia

rgblight_task logic fixes (#7214)

Joel Challis 5 vuotta sitten
vanhempi
commit
22812aee5c
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 2 2
      tmk_core/protocol/lufa/lufa.c
  2. 1 1
      tmk_core/protocol/vusb/main.c

+ 2 - 2
tmk_core/protocol/lufa/lufa.c

@@ -78,7 +78,7 @@ extern keymap_config_t keymap_config;
 #    include "virtser.h"
 #    include "virtser.h"
 #endif
 #endif
 
 
-#if (defined(RGB_MIDI) | defined(RGBLIGHT_ANIMATIONS)) & defined(RGBLIGHT_ENABLE)
+#if (defined(RGB_MIDI) || defined(RGBLIGHT_ANIMATIONS)) && defined(RGBLIGHT_ENABLE)
 #    include "rgblight.h"
 #    include "rgblight.h"
 #endif
 #endif
 
 
@@ -1001,7 +1001,7 @@ int main(void) {
         MIDI_Device_USBTask(&USB_MIDI_Interface);
         MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
 #endif
 
 
-#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
+#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
         rgblight_task();
         rgblight_task();
 #endif
 #endif
 
 

+ 1 - 1
tmk_core/protocol/vusb/main.c

@@ -22,7 +22,7 @@
 #include "debug.h"
 #include "debug.h"
 #include "rgblight_reconfig.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"
 #    include "rgblight.h"
 #endif
 #endif