diff options
author | Joel Challis <git@zvecr.com> | 2021-10-07 02:32:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 12:32:05 +1100 |
commit | 1c0347b8b85de03691c7810f98f38bb245783985 (patch) | |
tree | abd0d58a1e2d5134f1c307ad392c8616cab3266a /tmk_core | |
parent | 60297a1099e5a310bd10a4d59fcb80bbc7fe4be5 (diff) | |
download | qmk_firmware-1c0347b8b85de03691c7810f98f38bb245783985.tar.gz qmk_firmware-1c0347b8b85de03691c7810f98f38bb245783985.zip |
Remove SERIAL_LINK feature (#14727)
* Remove SERIAL_LINK
* more stale paths in doxygen-todo
* Fix
* More refs
* Update testing docs
* Update doxygen-todo
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/sync_timer.c | 2 | ||||
-rw-r--r-- | tmk_core/common/sync_timer.h | 2 | ||||
-rw-r--r-- | tmk_core/protocol/chibios/chibios.c | 21 |
3 files changed, 4 insertions, 21 deletions
diff --git a/tmk_core/common/sync_timer.c b/tmk_core/common/sync_timer.c index 68b92d8b4..de24b463b 100644 --- a/tmk_core/common/sync_timer.c +++ b/tmk_core/common/sync_timer.c | |||
@@ -26,7 +26,7 @@ SOFTWARE. | |||
26 | #include "sync_timer.h" | 26 | #include "sync_timer.h" |
27 | #include "keyboard.h" | 27 | #include "keyboard.h" |
28 | 28 | ||
29 | #if (defined(SPLIT_KEYBOARD) || defined(SERIAL_LINK_ENABLE)) && !defined(DISABLE_SYNC_TIMER) | 29 | #if defined(SPLIT_KEYBOARD) && !defined(DISABLE_SYNC_TIMER) |
30 | volatile int32_t sync_timer_ms; | 30 | volatile int32_t sync_timer_ms; |
31 | 31 | ||
32 | void sync_timer_init(void) { sync_timer_ms = 0; } | 32 | void sync_timer_init(void) { sync_timer_ms = 0; } |
diff --git a/tmk_core/common/sync_timer.h b/tmk_core/common/sync_timer.h index 744e2b50d..9ddef45bb 100644 --- a/tmk_core/common/sync_timer.h +++ b/tmk_core/common/sync_timer.h | |||
@@ -32,7 +32,7 @@ SOFTWARE. | |||
32 | extern "C" { | 32 | extern "C" { |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | #if (defined(SPLIT_KEYBOARD) || defined(SERIAL_LINK_ENABLE)) && !defined(DISABLE_SYNC_TIMER) | 35 | #if defined(SPLIT_KEYBOARD) && !defined(DISABLE_SYNC_TIMER) |
36 | void sync_timer_init(void); | 36 | void sync_timer_init(void); |
37 | void sync_timer_update(uint32_t time); | 37 | void sync_timer_update(uint32_t time); |
38 | uint16_t sync_timer_read(void); | 38 | uint16_t sync_timer_read(void); |
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c index 26181d8c7..c860328c8 100644 --- a/tmk_core/protocol/chibios/chibios.c +++ b/tmk_core/protocol/chibios/chibios.c | |||
@@ -43,9 +43,6 @@ | |||
43 | #ifdef SLEEP_LED_ENABLE | 43 | #ifdef SLEEP_LED_ENABLE |
44 | # include "sleep_led.h" | 44 | # include "sleep_led.h" |
45 | #endif | 45 | #endif |
46 | #ifdef SERIAL_LINK_ENABLE | ||
47 | # include "serial_link/system/serial_link.h" | ||
48 | #endif | ||
49 | #ifdef MIDI_ENABLE | 46 | #ifdef MIDI_ENABLE |
50 | # include "qmk_midi.h" | 47 | # include "qmk_midi.h" |
51 | #endif | 48 | #endif |
@@ -154,15 +151,11 @@ void protocol_init(void) { | |||
154 | setup_midi(); | 151 | setup_midi(); |
155 | #endif | 152 | #endif |
156 | 153 | ||
157 | #ifdef SERIAL_LINK_ENABLE | ||
158 | init_serial_link(); | ||
159 | #endif | ||
160 | |||
161 | host_driver_t *driver = NULL; | 154 | host_driver_t *driver = NULL; |
162 | 155 | ||
163 | /* Wait until the USB or serial link is active */ | 156 | /* Wait until USB is active */ |
164 | while (true) { | 157 | while (true) { |
165 | #if defined(WAIT_FOR_USB) || defined(SERIAL_LINK_ENABLE) | 158 | #if defined(WAIT_FOR_USB) |
166 | if (USB_DRIVER.state == USB_ACTIVE) { | 159 | if (USB_DRIVER.state == USB_ACTIVE) { |
167 | driver = &chibios_driver; | 160 | driver = &chibios_driver; |
168 | break; | 161 | break; |
@@ -171,13 +164,6 @@ void protocol_init(void) { | |||
171 | driver = &chibios_driver; | 164 | driver = &chibios_driver; |
172 | break; | 165 | break; |
173 | #endif | 166 | #endif |
174 | #ifdef SERIAL_LINK_ENABLE | ||
175 | if (is_serial_link_connected()) { | ||
176 | driver = get_serial_link_driver(); | ||
177 | break; | ||
178 | } | ||
179 | serial_link_update(); | ||
180 | #endif | ||
181 | wait_ms(50); | 167 | wait_ms(50); |
182 | } | 168 | } |
183 | 169 | ||
@@ -209,9 +195,6 @@ void protocol_task(void) { | |||
209 | print("[s]"); | 195 | print("[s]"); |
210 | while (USB_DRIVER.state == USB_SUSPENDED) { | 196 | while (USB_DRIVER.state == USB_SUSPENDED) { |
211 | /* Do this in the suspended state */ | 197 | /* Do this in the suspended state */ |
212 | # ifdef SERIAL_LINK_ENABLE | ||
213 | serial_link_update(); | ||
214 | # endif | ||
215 | suspend_power_down(); // on AVR this deep sleeps for 15ms | 198 | suspend_power_down(); // on AVR this deep sleeps for 15ms |
216 | /* Remote wakeup */ | 199 | /* Remote wakeup */ |
217 | if (suspend_wakeup_condition()) { | 200 | if (suspend_wakeup_condition()) { |