summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/wait.h
diff options
context:
space:
mode:
authorThat-Canadian <poole.chris.11@gmail.com>2017-08-03 10:52:30 -0400
committerThat-Canadian <poole.chris.11@gmail.com>2017-08-03 10:52:30 -0400
commitc33434c0d64dd7cbd5f6371c7cb4ac5e05924944 (patch)
tree59fe34d95089a59fa4e615fd995c81d274147bba /tmk_core/common/wait.h
parentdb5bb7dbbfa2d2eb4f41aa4c768c3c5c8d73f563 (diff)
parent07ba06d0b6e516bcfa4cbccbed9cfd8dc131072a (diff)
Merge branch 'master' into eco-keyboard
Diffstat (limited to 'tmk_core/common/wait.h')
-rw-r--r--tmk_core/common/wait.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index 911c9ddb5d..bdcb3f2a41 100644
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -1,6 +1,8 @@
#ifndef WAIT_H
#define WAIT_H
+#include <inttypes.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -16,8 +18,8 @@ extern "C" {
#elif defined(__arm__)
# include "wait_api.h"
#else // Unit tests
-#define wait_ms(ms)
-#define wait_us(us)
+void wait_ms(uint32_t ms);
+#define wait_us(us) wait_ms(us / 1000)
#endif
#ifdef __cplusplus