summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-08-13 18:23:14 +0100
committerDrashna Jaelre <drashna@live.com>2019-08-13 10:23:14 -0700
commitd8d2a096742f611e3ade527e7224e8281867c563 (patch)
treebcf44c2d53bf079f6a24901c7f709008216539f7 /tmk_core
parent576b138c6e1e1835acae6cf15dba07f3813db25d (diff)
Fix LT() crashing some ARM keyboards (#6529)
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/wait.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index a77840bcef..9aed372b7f 100644
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -13,8 +13,8 @@ extern "C" {
# define wait_us(us) _delay_us(us)
#elif defined PROTOCOL_CHIBIOS
# include "ch.h"
-# define wait_ms(ms) chThdSleepMilliseconds(ms)
-# define wait_us(us) chThdSleepMicroseconds(us)
+# define wait_ms(ms) do { if (ms != 0) { chThdSleepMilliseconds(ms); } else { chThdSleepMicroseconds(1); } } while (0)
+# define wait_us(us) do { if (us != 0) { chThdSleepMicroseconds(us); } else { chThdSleepMicroseconds(1); } } while (0)
#elif defined PROTOCOL_ARM_ATSAM
# include "clks.h"
# define wait_ms(ms) CLK_delay_ms(ms)