diff options
| author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
|---|---|---|
| committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
| commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
| tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /tmk_core/common/wait.h | |
| parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
| parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'tmk_core/common/wait.h')
| -rw-r--r-- | tmk_core/common/wait.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h index 40d00b0c75..82727be012 100644 --- a/tmk_core/common/wait.h +++ b/tmk_core/common/wait.h @@ -9,9 +9,13 @@ extern "C" { # include <util/delay.h> # define wait_ms(ms) _delay_ms(ms) # define wait_us(us) _delay_us(us) -#elif defined(__arm__) +#elif defined(PROTOCOL_CHIBIOS) /* __AVR__ */ +# include "ch.h" +# define wait_ms(ms) chThdSleepMilliseconds(ms) +# define wait_us(us) chThdSleepMicroseconds(us) +#elif defined(__arm__) /* __AVR__ */ # include "wait_api.h" -#endif +#endif /* __AVR__ */ #ifdef __cplusplus } |