From ba628a28bcf09421739922d8eeef05e6ca9e9b6b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 19 Jan 2020 00:59:09 +0000
Subject: [PATCH] Move rgblight and backlight task to common location (#7733)

---
 quantum/quantum.c                |  6 +-----
 tmk_core/common/keyboard.c       | 10 ++++++++++
 tmk_core/protocol/chibios/main.c |  3 ---
 tmk_core/protocol/lufa/lufa.c    |  4 ----
 tmk_core/protocol/vusb/main.c    |  4 ----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index bf159644ab6d0270f06139dce395db655c1f7933..9cd50b11d8a49b4801d39b905ce246e64dbbaa3e 100644
--- 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
index 794a9152fbeb749c0e588864137e4de33ae2821f..cb4e7637fa1a3061cf78815af0d49499188eb9f4 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -335,6 +335,16 @@ MATRIX_LOOP_END:
     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
index c304f4d795c2b7b1bcd1bf2d6a997c14e9d5fc76..4b66bc5224b6ff6465ae5d4a21e6c9d59b3733a3 100644
--- 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
index 8319b34e94dd7bf319bd9240e02f513bff5f151b..7d325a9ba2bcfadf3f85c845bb9b4649fd74b9bf 100644
--- 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
index e6291900e6c866d6883aa591a164509986824a63..06dc8ae67fee3b8f1912f695027e8ac0b82d0146 100644
--- 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();
         }