diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2020-11-30 04:18:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 21:18:19 +1100 |
| commit | 485e4524f47f15d9581c1cd2619bbcd321380f68 (patch) | |
| tree | 70a40dfe3c842755fe8b8dc2537ca0cc8acd2b77 | |
| parent | ce91dd4bf320ca159401fd8db24781c44ab7d405 (diff) | |
| download | qmk_firmware-485e4524f47f15d9581c1cd2619bbcd321380f68.tar.gz qmk_firmware-485e4524f47f15d9581c1cd2619bbcd321380f68.zip | |
Fix int wrapping for timer_expired macros and use MAX defines for consistency and clarity (#10996)
| -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 52bc1cc67..7ee7feac2 100644 --- a/tmk_core/common/timer.h +++ b/tmk_core/common/timer.h | |||
| @@ -45,8 +45,8 @@ uint16_t timer_elapsed(uint16_t last); | |||
| 45 | uint32_t timer_elapsed32(uint32_t last); | 45 | uint32_t timer_elapsed32(uint32_t last); |
| 46 | 46 | ||
| 47 | // Utility functions to check if a future time has expired & autmatically handle time wrapping if checked / reset frequently (half of max value) | 47 | // Utility functions to check if a future time has expired & autmatically handle time wrapping if checked / reset frequently (half of max value) |
| 48 | #define timer_expired(current, future) (((uint16_t)current - (uint16_t)future) < 0x8000) | 48 | #define timer_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2) |
| 49 | #define timer_expired32(current, future) (((uint32_t)current - (uint32_t)future) < 0x80000000) | 49 | #define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2) |
| 50 | 50 | ||
| 51 | #ifdef __cplusplus | 51 | #ifdef __cplusplus |
| 52 | } | 52 | } |