diff options
author | Callum Oakley <callum@pusher.com> | 2017-08-19 10:34:45 +0100 |
---|---|---|
committer | Callum Oakley <callum@pusher.com> | 2017-08-19 10:34:45 +0100 |
commit | a6845036e25c4f4d936dcd12cd0ddedd2894b30e (patch) | |
tree | b23b4e8d9d757aa3c0d42be561572533ae0d126c /tmk_core/common/wait.h | |
parent | 84a8aabe5bf8807595f98de44d18f6a31b892edf (diff) | |
parent | 7277f09bbadcce120f819132dec8ff7172caacc4 (diff) |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'tmk_core/common/wait.h')
-rw-r--r-- | tmk_core/common/wait.h | 6 |
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 |