diff options
| author | QMK Bot <hello@qmk.fm> | 2021-04-25 03:16:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-04-25 03:16:16 +0000 |
| commit | 2a61a500de6fb286cedf644f56d70d05a0b96f0d (patch) | |
| tree | c25c5066825ff02733cb8f347efbb444733eb998 /tmk_core/protocol/chibios | |
| parent | 64a9cf18e154aab7c767f2a519530d4190f49d8c (diff) | |
| parent | d3bf3d3b1cfa9bd6d60ef605cf767e1fb1957c07 (diff) | |
| download | qmk_firmware-2a61a500de6fb286cedf644f56d70d05a0b96f0d.tar.gz qmk_firmware-2a61a500de6fb286cedf644f56d70d05a0b96f0d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol/chibios')
| -rw-r--r-- | tmk_core/protocol/chibios/usb_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c index 0703cdc71..d04302aca 100644 --- a/tmk_core/protocol/chibios/usb_main.c +++ b/tmk_core/protocol/chibios/usb_main.c | |||
| @@ -953,8 +953,8 @@ int8_t sendchar(uint8_t c) { | |||
| 953 | */ | 953 | */ |
| 954 | 954 | ||
| 955 | const sysinterval_t timeout = timed_out ? TIME_IMMEDIATE : TIME_MS2I(5); | 955 | const sysinterval_t timeout = timed_out ? TIME_IMMEDIATE : TIME_MS2I(5); |
| 956 | const size_t result = chnWriteTimeout(&drivers.console_driver.driver, &c, 1, timeout); | 956 | const size_t result = chnWriteTimeout(&drivers.console_driver.driver, &c, 1, timeout); |
| 957 | timed_out = (result == 0); | 957 | timed_out = (result == 0); |
| 958 | return result; | 958 | return result; |
| 959 | } | 959 | } |
| 960 | 960 | ||