masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the #10088 hotfix for Teensy 3.1-like Input:Club keyboards (#12870) 

* Remove the #10088 hotfix for K20x MCU:s.

It seems to _cause_ the issue it intended to solve there.

* Cleaner way of removing #10088 hotfix.

Now only affects Ergodox Infinity, Whitefox and K-type, though.

Switches over Ergodox Infinity to the `IC_TEENSY_3_1` board, since that
was a nice place to implement the `restart_usb_driver` override.
However, I would guess this issue is present for other K20x/Teensy 3.1
boards as well...

* Fix comment regarding `IC_TEENSY_3_1` for all keyboards using it.
This commit is contained in:
Joakim Tufvegren 2021-08-03 23:38:37 +02:00 committed by GitHub
parent 34de7ca224
commit 1409b36851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keyboards/ergodox_infinity/rules.mk
View File

@ -4,6 +4,13 @@ MCU = MK20DX256
# Bootloader selection # Bootloader selection
BOOTLOADER = kiibohd BOOTLOADER = kiibohd
# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
# This board was copied from PJRC_TEENSY_3_1. The only difference should be a
# hack to ensure the watchdog has started before trying to disable it, and an
# override to disable restart of USB driver after returning from suspend.
BOARD = IC_TEENSY_3_1
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #

3
keyboards/k_type/rules.mk
View File

@ -7,7 +7,8 @@ BOOTLOADER = kiibohd
# Board: it should exist either in <chibios>/os/hal/boards/ # Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards # or <this_dir>/boards
# This board was copied from PJRC_TEENSY_3_1. The only difference should be a # This board was copied from PJRC_TEENSY_3_1. The only difference should be a
# hack to ensure the watchdog has started before trying to disable it. # hack to ensure the watchdog has started before trying to disable it, and an
# override to disable restart of USB driver after returning from suspend.
BOARD = IC_TEENSY_3_1 BOARD = IC_TEENSY_3_1
# Build Options # Build Options

8
keyboards/whitefox/rules.mk
View File

@ -6,11 +6,9 @@ BOOTLOADER = kiibohd
# Board: it should exist either in <chibios>/os/hal/boards/ # Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards # or <this_dir>/boards
# - BOARD = # This board was copied from PJRC_TEENSY_3_1. The only difference should be a
# - PJRC_TEENSY_LC for Teensy LC # hack to ensure the watchdog has started before trying to disable it, and an
# - PJRC_TEENSY_3 for Teensy 3.0 # override to disable restart of USB driver after returning from suspend.
# - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2
# - MCHCK_K20 for Infinity KB
BOARD = IC_TEENSY_3_1 BOARD = IC_TEENSY_3_1
# Build Options # Build Options

5
platforms/chibios/IC_TEENSY_3_1/board/board.c
View File

@ -144,3 +144,8 @@ void __early_init(void) {
* @todo Add your board-specific code, if any. * @todo Add your board-specific code, if any.
*/ */
void boardInit(void) {} void boardInit(void) {}
void restart_usb_driver(USBDriver *usbp) {
// Do nothing. Restarting the USB driver on these boards breaks it.
}

2
tmk_core/protocol/chibios/usb_main.c
View File

@ -705,7 +705,7 @@ void init_usb_driver(USBDriver *usbp) {
chVTObjectInit(&keyboard_idle_timer); chVTObjectInit(&keyboard_idle_timer);
} }
void restart_usb_driver(USBDriver *usbp) { __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
usbStop(usbp); usbStop(usbp);
usbDisconnectBus(usbp); usbDisconnectBus(usbp);