make wakeup delay configurable, and adjust value

qmk · Feb 1, 2021 · f1fb386 · f1fb386
1 parent f32e0c8
commit f1fb386
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/docs/config_options.md b/docs/config_options.md
@@ -97,6 +97,8 @@ This is a C header file that is one of the first things included, and will persi
   * sets the maximum power (in mA) over USB for the device (default: 500)
 * `#define USB_POLLING_INTERVAL_MS 10`
   * sets the USB polling rate in milliseconds for the keyboard, mouse, and shared (NKRO/media keys) interfaces
+* `#define USB_SUSPEND_WAKEUP_DELAY 200`
+  * set the number of milliseconde to pause after sending a wakeup packet
 * `#define F_SCL 100000L`
   * sets the I2C clock rate speed for keyboards using I2C. The default is `400000L`, except for keyboards using `split_common`, where the default is `100000L`.
 

diff --git a/tmk_core/common/suspend.h b/tmk_core/common/suspend.h
@@ -12,3 +12,7 @@ void suspend_wakeup_init_user(void);
 void suspend_wakeup_init_kb(void);
 void suspend_power_down_user(void);
 void suspend_power_down_kb(void);
+
+#ifndef USB_SUSPEND_WAKEUP_DELAY
+#    define USB_SUSPEND_WAKEUP_DELAY 200
+#endif
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
@@ -240,13 +240,15 @@ int main(void) {
                 if (suspend_wakeup_condition()) {
                     usbWakeupHost(&USB_DRIVER);
 
+#    if USB_SUSPEND_WAKEUP_DELAY > 0
                     // Some hubs, kvm switches, and monitors do
                     // weird things, with USB device state bouncing
                     // around wildly on wakeup, yielding race
                     // conditions that can corrupt the keyboard state.
                     //
                     // Pause for a while to let things settle...
-                    wait_ms(100);
+                    wait_ms(USB_SUSPEND_WAKEUP_DELAY);
+#    endif
 
                     restart_usb_driver(&USB_DRIVER);
                 }

diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
@@ -1083,13 +1083,15 @@ int main(void) {
                     USB_Device_SendRemoteWakeup();
                     clear_keyboard();
 
+#    if USB_SUSPEND_WAKEUP_DELAY > 0
                     // Some hubs, kvm switches, and monitors do
                     // weird things, with USB device state bouncing
                     // around wildly on wakeup, yielding race
                     // conditions that can corrupt the keyboard state.
                     //
                     // Pause for a while to let things settle...
-                    wait_ms(100);
+                    wait_ms(USB_SUSPEND_WAKEUP_DELAY);
+#    endif
                 }
             }
             suspend_wakeup_init();