From 485e4524f47f15d9581c1cd2619bbcd321380f68 Mon Sep 17 00:00:00 2001 From: XScorpion2 Date: Mon, 30 Nov 2020 04:18:19 -0600 Subject: [PATCH] Fix int wrapping for timer_expired macros and use MAX defines for consistency and clarity (#10996) --- tmk_core/common/timer.h | 4 ++-- 1 file 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); 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) -#define timer_expired(current, future) (((uint16_t)current - (uint16_t)future) < 0x8000) -#define timer_expired32(current, future) (((uint32_t)current - (uint32_t)future) < 0x80000000) +#define timer_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2) +#define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2) #ifdef __cplusplus }