aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/action_util.c
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core/common/action_util.c')
-rw-r--r--tmk_core/common/action_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c
index afd4ae8b2..58401ace5 100644
--- a/tmk_core/common/action_util.c
+++ b/tmk_core/common/action_util.c
@@ -54,7 +54,7 @@ int8_t get_oneshot_locked_mods(void) { return oneshot_locked_mods; }
54void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; } 54void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; }
55void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; } 55void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; }
56#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) 56#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
57static int16_t oneshot_time = 0; 57static uint16_t oneshot_time = 0;
58bool has_oneshot_mods_timed_out(void) { 58bool has_oneshot_mods_timed_out(void) {
59 return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; 59 return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
60} 60}
@@ -79,7 +79,7 @@ inline uint8_t get_oneshot_layer(void) { return oneshot_layer_data >> 3; }
79inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; } 79inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; }
80 80
81#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) 81#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
82static int16_t oneshot_layer_time = 0; 82static uint16_t oneshot_layer_time = 0;
83inline bool has_oneshot_layer_timed_out() { 83inline bool has_oneshot_layer_timed_out() {
84 return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && 84 return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT &&
85 !(get_oneshot_layer_state() & ONESHOT_TOGGLED); 85 !(get_oneshot_layer_state() & ONESHOT_TOGGLED);