fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 19:40:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix int wrapping for timer_expired macros and use MAX defines for consistency and clarity (#10996)

Browse source
This commit is contained in:
XScorpion2 2020-11-30 04:18:19 -06:00 committed by GitHub
parent ce91dd4bf3
commit 485e4524f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/common/timer.h
View file

@ -45,8 +45,8 @@ uint16_t timer_elapsed(uint16_t last);
uint32_t timer_elapsed32(uint32_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) // 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_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2)
#define timer_expired32(current, future) (((uint32_t)current - (uint32_t)future) < 0x80000000) #define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2)
#ifdef __cplusplus #ifdef __cplusplus
} }