diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-07-02 00:06:39 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-07-09 03:59:51 +0200 |
| commit | 4087d6da0d60f51735f6ec2c34e5fdabcf9c4447 (patch) | |
| tree | 7607e45b2259afe96e1f31397f4db28c2060b8ec /tmk_core | |
| parent | fc4bfbe580c520caed5b6682790019658133f74e (diff) | |
| download | qmk_firmware-4087d6da0d60f51735f6ec2c34e5fdabcf9c4447.tar.gz qmk_firmware-4087d6da0d60f51735f6ec2c34e5fdabcf9c4447.tar.xz | |
Add wait support for tests
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/test/timer.c | 6 | ||||
| -rw-r--r-- | tmk_core/common/wait.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tmk_core/common/test/timer.c b/tmk_core/common/test/timer.c index 49efc1c1e..19e79e1f5 100644 --- a/tmk_core/common/test/timer.c +++ b/tmk_core/common/test/timer.c @@ -28,4 +28,8 @@ uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last) uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); } void set_time(uint32_t t) { current_time = t; } -void advance_time(uint32_t ms) { current_time += ms; }
\ No newline at end of file +void advance_time(uint32_t ms) { current_time += ms; } + +void wait_ms(uint32_t ms) { + advance_time(ms); +}
\ No newline at end of file diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h index 911c9ddb5..bdcb3f2a4 100644 --- a/tmk_core/common/wait.h +++ b/tmk_core/common/wait.h @@ -1,6 +1,8 @@ #ifndef WAIT_H #define WAIT_H +#include <inttypes.h> + #ifdef __cplusplus extern "C" { #endif @@ -16,8 +18,8 @@ extern "C" { #elif defined(__arm__) # include "wait_api.h" #else // Unit tests -#define wait_ms(ms) -#define wait_us(us) +void wait_ms(uint32_t ms); +#define wait_us(us) wait_ms(us / 1000) #endif #ifdef __cplusplus |