Fixing wrapping math logic for timer_expired functions (qmk#6746)

zsa · Oct 5, 2019 · 9e2be5e · 9e2be5e
1 parent a5d07e9
commit 9e2be5e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 }