diff options
author | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-07-04 17:17:28 +0200 |
---|---|---|
committer | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-07-04 17:17:28 +0200 |
commit | d5486265b8afcada68306c815b08c225fce287af (patch) | |
tree | 8fb7f8fee4aa3937003bd69d5c77ca867c010d12 /tmk_core/common/wait.h | |
parent | 738b072bb0f25d0369a998c550c369e4f64cc7a5 (diff) | |
parent | 34c8bf47a76c8a2dcd3b1a19dd608f8fb2fafb31 (diff) | |
download | qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.gz qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.xz |
Merge branch 'master' into ps2avrGB
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 82727be01..911c9ddb5 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 } |