qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-23 01:12:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into xap

Browse Source
This commit is contained in:
Nick Brassel
2024-05-02 20:48:16 +10:00
parent c0bdc910cb ac80cee9da
commit 6aacdb0b76
833 changed files with 20096 additions and 3668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tmk_core/protocol/chibios/chibios.c
+6 -1
View File
@@ -51,6 +51,11 @@
#define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED (2U)
#ifdef WAIT_FOR_USB
// TODO: Remove backwards compatibility with old define
# define USB_WAIT_FOR_ENUMERATION
#endif
/* -------------------------
* TMK host driver defs
* -------------------------
@@ -143,7 +148,7 @@ void protocol_pre_init(void) {
/* Wait until USB is active */
while (true) {
#if defined(WAIT_FOR_USB)
#if defined(USB_WAIT_FOR_ENUMERATION)
if (USB_DRIVER.state == USB_ACTIVE) {
driver = &chibios_driver;
break;
tmk_core/protocol/lufa/lufa.c
+6 -1
View File
@@ -71,6 +71,11 @@
# include "xap.h"
#endif
#ifdef WAIT_FOR_USB
// TODO: Remove backwards compatibility with old define
# define USB_WAIT_FOR_ENUMERATION
#endif
uint8_t keyboard_idle = 0;
/* 0: Boot Protocol, 1: Report Protocol(default) */
uint8_t keyboard_protocol = 1;
@@ -916,7 +921,7 @@ void protocol_pre_init(void) {
/* wait for USB startup & debug output */
#ifdef WAIT_FOR_USB
#ifdef USB_WAIT_FOR_ENUMERATION
while (USB_DeviceState != DEVICE_STATE_Configured) {
# if defined(INTERRUPT_CONTROL_ENDPOINT)
;