diff options
| author | Joel Challis <git@zvecr.com> | 2020-02-05 03:37:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 19:37:04 -0800 |
| commit | 307be48de9a24a182420a6c42222906132035ea2 (patch) | |
| tree | 269de1fe60e4f36b5ba1d266060308dc49209df3 /keyboards | |
| parent | a557a5b2c5e62c20e037fbca56dc902a20cd6ff8 (diff) | |
| download | qmk_firmware-307be48de9a24a182420a6c42222906132035ea2.tar.gz qmk_firmware-307be48de9a24a182420a6c42222906132035ea2.zip | |
Reduce SPLIT_USB_TIMEOUT by 500ms (#7637)
* Update SPLIT_USB_TIMEOUT -500ms
* Align keyboard level SPLIT_USB_TIMEOUT defaults
* Align keyboard level SPLIT_USB_TIMEOUT_POLL
* Review fixes
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/crkbd/rev1/split_util.c | 12 | ||||
| -rw-r--r-- | keyboards/helix/rev2/split_util.c | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/keyboards/crkbd/rev1/split_util.c b/keyboards/crkbd/rev1/split_util.c index 35aa54d780..b642a734cc 100644 --- a/keyboards/crkbd/rev1/split_util.c +++ b/keyboards/crkbd/rev1/split_util.c @@ -20,18 +20,22 @@ #endif #ifndef SPLIT_USB_TIMEOUT -# define SPLIT_USB_TIMEOUT 2500 +# define SPLIT_USB_TIMEOUT 2000 +#endif + +#ifndef SPLIT_USB_TIMEOUT_POLL +# define SPLIT_USB_TIMEOUT_POLL 10 #endif volatile bool isLeftHand = true; bool waitForUsb(void) { - for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / 100); i++) { - // This will return true of a USB connection has been established + for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) { + // This will return true if a USB connection has been established if (UDADDR & _BV(ADDEN)) { return true; } - wait_ms(100); + wait_ms(SPLIT_USB_TIMEOUT_POLL); } // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow diff --git a/keyboards/helix/rev2/split_util.c b/keyboards/helix/rev2/split_util.c index 89df43e277..9d31d0dec3 100644 --- a/keyboards/helix/rev2/split_util.c +++ b/keyboards/helix/rev2/split_util.c @@ -20,18 +20,22 @@ #endif #ifndef SPLIT_USB_TIMEOUT - #define SPLIT_USB_TIMEOUT 2500 +# define SPLIT_USB_TIMEOUT 2000 +#endif + +#ifndef SPLIT_USB_TIMEOUT_POLL +# define SPLIT_USB_TIMEOUT_POLL 10 #endif volatile bool isLeftHand = true; bool waitForUsb(void) { - for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / 100); i++) { - // This will return true of a USB connection has been established + for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) { + // This will return true if a USB connection has been established if (UDADDR & _BV(ADDEN)) { return true; } - wait_ms(100); + wait_ms(SPLIT_USB_TIMEOUT_POLL); } // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow |