Move rgblight and backlight task to common location

qmk · Jan 13, 2020 · bca857a · bca857a
1 parent b89e35b
commit bca857a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/quantum/quantum.c b/quantum/quantum.c
@@ -634,12 +634,8 @@ void matrix_scan_quantum() {
     matrix_scan_combo();
 #endif
 
-#if defined(BACKLIGHT_ENABLE)
-#    if defined(LED_MATRIX_ENABLE)
+#ifdef LED_MATRIX_ENABLE
     led_matrix_task();
-#    elif defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)
-    backlight_task();
-#    endif
 #endif
 
 #ifdef RGB_MATRIX_ENABLE

diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
@@ -335,6 +335,16 @@ void keyboard_task(void) {
     matrix_scan_perf_task();
 #endif
 
+#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
+    rgblight_task();
+#endif
+
+#if defined(BACKLIGHT_ENABLE)
+#    if defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)
+    backlight_task();
+#    endif
+#endif
+
 #ifdef QWIIC_ENABLE
     qwiic_task();
 #endif

diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
@@ -219,9 +219,6 @@ int main(void) {
 #endif
 #ifdef RAW_ENABLE
         raw_hid_task();
-#endif
-#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
-        rgblight_task();
 #endif
     }
 }
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
@@ -998,10 +998,6 @@ int main(void) {
         MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
 
-#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
-        rgblight_task();
-#endif
-
 #ifdef MODULE_ADAFRUIT_BLE
         adafruit_ble_task();
 #endif

diff --git a/tmk_core/protocol/vusb/main.c b/tmk_core/protocol/vusb/main.c
@@ -99,10 +99,6 @@ int main(void) {
             // To prevent failing to configure NOT scan keyboard during configuration
             if (usbConfiguration && usbInterruptIsReady()) {
                 keyboard_task();
-
-#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
-                rgblight_task();
-#endif
             }
             vusb_transfer_keyboard();
         }