diff options
author | XScorpion2 <rcalt2vt@gmail.com> | 2019-09-22 09:52:33 -0500 |
---|---|---|
committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-11-04 16:49:55 +0900 |
commit | 9dbff9f9c84160144037bef7a418c6e9e5c0d3a4 (patch) | |
tree | 277437f0376b9a3971a4241e30164f4f3a6bf8f2 /tmk_core | |
parent | de86a0111a18771d3dd1e905076f3e34202b1f59 (diff) |
Fixing wrapping math logic for timer_expired functions (#6746)
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/timer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/timer.h b/tmk_core/common/timer.h index 853cb98396..378cf7892c 100644 --- a/tmk_core/common/timer.h +++ b/tmk_core/common/timer.h @@ -45,9 +45,9 @@ uint16_t timer_elapsed(uint16_t last); uint32_t timer_elapsed32(uint32_t last); // Utility functions to check if a future time has expired & autmatically handle time wrapping if checked / reset frequently (half of max value) -inline bool timer_expired(uint16_t current, uint16_t last) { return current - last < 0x8000; } +inline bool timer_expired(uint16_t current, uint16_t future) { return (uint16_t)(current - future) < 0x8000; } -inline bool timer_expired32(uint32_t current, uint32_t future) { return current - future < 0x80000000; } +inline bool timer_expired32(uint32_t current, uint32_t future) { return (uint32_t)(current - future) < 0x80000000; } #ifdef __cplusplus } |