HCoop
/
jackhill
/
qmk
/
firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a1452db
)
Move rgblight and backlight task to common location (#7733)
author
Joel Challis
<git@zvecr.com>
Sun, 19 Jan 2020 00:59:09 +0000
(
00:59
+0000)
committer
GitHub
<noreply@github.com>
Sun, 19 Jan 2020 00:59:09 +0000
(
00:59
+0000)
quantum/quantum.c
patch
|
blob
|
blame
|
history
tmk_core/common/keyboard.c
patch
|
blob
|
blame
|
history
tmk_core/protocol/chibios/main.c
patch
|
blob
|
blame
|
history
tmk_core/protocol/lufa/lufa.c
patch
|
blob
|
blame
|
history
tmk_core/protocol/vusb/main.c
patch
|
blob
|
blame
|
history
diff --git
a/quantum/quantum.c
b/quantum/quantum.c
index
bf15964
..
9cd50b1
100644
(file)
--- a/
quantum/quantum.c
+++ b/
quantum/quantum.c
@@
-634,12
+634,8
@@
void matrix_scan_quantum() {
matrix_scan_combo();
#endif
matrix_scan_combo();
#endif
-#if defined(BACKLIGHT_ENABLE)
-# if defined(LED_MATRIX_ENABLE)
+#ifdef LED_MATRIX_ENABLE
led_matrix_task();
led_matrix_task();
-# elif defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)
- backlight_task();
-# endif
#endif
#ifdef RGB_MATRIX_ENABLE
#endif
#ifdef RGB_MATRIX_ENABLE
diff --git
a/tmk_core/common/keyboard.c
b/tmk_core/common/keyboard.c
index
794a915
..
cb4e763
100644
(file)
--- a/
tmk_core/common/keyboard.c
+++ b/
tmk_core/common/keyboard.c
@@
-335,6
+335,16
@@
MATRIX_LOOP_END:
matrix_scan_perf_task();
#endif
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
#ifdef QWIIC_ENABLE
qwiic_task();
#endif
diff --git
a/tmk_core/protocol/chibios/main.c
b/tmk_core/protocol/chibios/main.c
index
c304f4d
..
4b66bc5
100644
(file)
--- 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
#ifdef RAW_ENABLE
raw_hid_task();
-#endif
-#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
- rgblight_task();
#endif
}
}
#endif
}
}
diff --git
a/tmk_core/protocol/lufa/lufa.c
b/tmk_core/protocol/lufa/lufa.c
index
8319b34
..
7d325a9
100644
(file)
--- 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
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
#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
e629190
..
06dc8ae
100644
(file)
--- 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();
// 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();
}
}
vusb_transfer_keyboard();
}