1
0
Fork 0

Move rgblight and backlight task to common location (#7733)

This commit is contained in:
Joel Challis 2020-01-19 00:59:09 +00:00 committed by GitHub
parent a1452db98a
commit ba628a28bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 16 deletions

View file

@ -634,12 +634,8 @@ void matrix_scan_quantum() {
matrix_scan_combo(); matrix_scan_combo();
#endif #endif
#if defined(BACKLIGHT_ENABLE) #ifdef LED_MATRIX_ENABLE
# if defined(LED_MATRIX_ENABLE)
led_matrix_task(); led_matrix_task();
# elif defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)
backlight_task();
# endif
#endif #endif
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE

View file

@ -335,6 +335,16 @@ MATRIX_LOOP_END:
matrix_scan_perf_task(); matrix_scan_perf_task();
#endif #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 #ifdef QWIIC_ENABLE
qwiic_task(); qwiic_task();
#endif #endif

View file

@ -219,9 +219,6 @@ int main(void) {
#endif #endif
#ifdef RAW_ENABLE #ifdef RAW_ENABLE
raw_hid_task(); raw_hid_task();
#endif
#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
rgblight_task();
#endif #endif
} }
} }

View file

@ -998,10 +998,6 @@ int main(void) {
MIDI_Device_USBTask(&USB_MIDI_Interface); MIDI_Device_USBTask(&USB_MIDI_Interface);
#endif #endif
#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
rgblight_task();
#endif
#ifdef MODULE_ADAFRUIT_BLE #ifdef MODULE_ADAFRUIT_BLE
adafruit_ble_task(); adafruit_ble_task();
#endif #endif

View file

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