diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2018-01-21 10:56:41 +0200 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-01-21 01:10:16 -0800 |
| commit | a14d539ad67a59d297908f2eb1589cb68d990194 (patch) | |
| tree | 54ad0f2e13d4cca952fc0b243156853e08100bca /tmk_core | |
| parent | 510a8d33394780a0713b26a0c516ecab1b140bc2 (diff) | |
| download | qmk_firmware-a14d539ad67a59d297908f2eb1589cb68d990194.tar.gz qmk_firmware-a14d539ad67a59d297908f2eb1589cb68d990194.zip | |
Revert back to normal sleeping wait behaviour for STM32
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/wait.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h index 553f5243f..a7cded942 100644 --- a/tmk_core/common/wait.h +++ b/tmk_core/common/wait.h | |||
| @@ -13,13 +13,8 @@ extern "C" { | |||
| 13 | # define wait_us(us) _delay_us(us) | 13 | # define wait_us(us) _delay_us(us) |
| 14 | #elif defined PROTOCOL_CHIBIOS | 14 | #elif defined PROTOCOL_CHIBIOS |
| 15 | # include "ch.h" | 15 | # include "ch.h" |
| 16 | # if defined(STM32F3xx_MCUCONF) | 16 | # define wait_ms(ms) chThdSleepMilliseconds(ms) |
| 17 | # define wait_ms(ms) chSysPolledDelayX(MS2RTC(STM32_HCLK, (ms))) | 17 | # define wait_us(us) chThdSleepMicroseconds(us) |
| 18 | # define wait_us(us) chSysPolledDelayX(US2RTC(STM32_HCLK, (us))) | ||
| 19 | # else | ||
| 20 | # define wait_ms(ms) chThdSleepMilliseconds(ms) | ||
| 21 | # define wait_us(us) chThdSleepMicroseconds(us) | ||
| 22 | # endif | ||
| 23 | #elif defined(__arm__) | 18 | #elif defined(__arm__) |
| 24 | # include "wait_api.h" | 19 | # include "wait_api.h" |
| 25 | #else // Unit tests | 20 | #else // Unit tests |