Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relocate rgblight and backlight task #7733

Merged
merged 1 commit into from
Jan 19, 2020
Merged

Relocate rgblight and backlight task #7733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions quantum/quantum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions tmk_core/common/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions tmk_core/protocol/chibios/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
4 changes: 0 additions & 4 deletions tmk_core/protocol/lufa/lufa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions tmk_core/protocol/vusb/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down