aboutsummaryrefslogtreecommitdiff
path: root/quantum/main.c
diff options
context:
space:
mode:
authorJoel Challis <[email protected]>2024-03-14 10:45:12 +0000
committerGitHub <[email protected]>2024-03-14 21:45:12 +1100
commit63dd131d812be4b8d4894fc20ca9968e25996b07 (patch)
treeb51902172408e9325aef625034cbf8f6a92e55e0 /quantum/main.c
parent4bbfecae90e994b4a7d9bf5db06a995fb05d6ab2 (diff)
downloadqmk_firmware-63dd131d812be4b8d4894fc20ca9968e25996b07.tar.gz
qmk_firmware-63dd131d812be4b8d4894fc20ca9968e25996b07.zip
Refactor vusb to protocol use pre/post task (#14944)
Diffstat (limited to 'quantum/main.c')
-rw-r--r--quantum/main.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/quantum/main.c b/quantum/main.c
index 3b101c522c..3159c55850 100644
--- a/quantum/main.c
+++ b/quantum/main.c
@@ -25,22 +25,9 @@ void protocol_pre_task(void);
void protocol_post_task(void);
// Bodge as refactoring this area sucks....
-void protocol_init(void) __attribute__((weak));
-void protocol_init(void) {
- protocol_pre_init();
-
- keyboard_init();
-
- protocol_post_init();
-}
-
-void protocol_task(void) __attribute__((weak));
-void protocol_task(void) {
- protocol_pre_task();
-
+void protocol_keyboard_task(void) __attribute__((weak));
+void protocol_keyboard_task(void) {
keyboard_task();
-
- protocol_post_task();
}
/** \brief Main
@@ -53,11 +40,25 @@ int main(void) {
protocol_setup();
keyboard_setup();
- protocol_init();
+ protocol_pre_init();
+ keyboard_init();
+ protocol_post_init();
/* Main loop */
while (true) {
- protocol_task();
+ protocol_pre_task();
+ protocol_keyboard_task();
+ protocol_post_task();
+
+#ifdef RAW_ENABLE
+ void raw_hid_task(void);
+ raw_hid_task();
+#endif
+
+#ifdef CONSOLE_ENABLE
+ void console_task(void);
+ console_task();
+#endif
#ifdef QUANTUM_PAINTER_ENABLE
// Run Quantum Painter task