diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-19 14:04:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 14:04:19 -0400 |
| commit | e951317acbad8ef67a9da13b657e13e6c1d27e1d (patch) | |
| tree | a9c616a4a7d91eaf38bef570c9487493ca2b2c2e /tmk_core/common/wait.h | |
| parent | 621ae42a6cb9f96b8c02a0094b36daf125c4e6ca (diff) | |
| parent | 1aa0be4cf1d00f852150e2b2ed5e4c151aeeef3a (diff) | |
Merge pull request #1409 from fredizzimo/full_unit_test
Take first baby steps towards testing the whole QMK
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 } |