diff options
| author | Stick <nstickney@gmail.com> | 2017-06-22 13:06:30 -0500 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-22 13:06:30 -0500 |
| commit | fa96d64f3761e6cd0661c63a3fc257b58c669be0 (patch) | |
| tree | 85a7b88c4b1f3898c606af013a478db39dc392b5 /tmk_core/common/wait.h | |
| parent | 4b50ab029d49830cf0efd0e5e0606cb39c8dabae (diff) | |
| parent | 2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/wait.h')
| -rw-r--r-- | tmk_core/common/wait.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h index 82727be012..911c9ddb5d 100644 --- a/tmk_core/common/wait.h +++ b/tmk_core/common/wait.h @@ -9,13 +9,16 @@ extern "C" { # include <util/delay.h> # define wait_ms(ms) _delay_ms(ms) # define wait_us(us) _delay_us(us) -#elif defined(PROTOCOL_CHIBIOS) /* __AVR__ */ +#elif defined(PROTOCOL_CHIBIOS) # include "ch.h" # define wait_ms(ms) chThdSleepMilliseconds(ms) # define wait_us(us) chThdSleepMicroseconds(us) -#elif defined(__arm__) /* __AVR__ */ +#elif defined(__arm__) # include "wait_api.h" -#endif /* __AVR__ */ +#else // Unit tests +#define wait_ms(ms) +#define wait_us(us) +#endif #ifdef __cplusplus } |