diff options
| author |  Shihpin Tseng <deftsp@gmail.com> | 2019-01-26 04:09:53 +0800 |
|---|---|---|
| committer |  Drashna Jaelre <drashna@live.com> | 2019-01-25 12:09:53 -0800 |
| commit | b4161136167556afd9a6073aa476846b90e3bfab (patch) | |
| tree | fc5d1b8c8a5c95fceead59d6617f12dd8e292dc5 | |
| parent | 3c0c432836fb251c48b9cefc20cc0cdde36758bb (diff) | |
| download | qmk_firmware-b4161136167556afd9a6073aa476846b90e3bfab.tar.gz | |
Fix oneshot_time wrong type (#3696)
* Fix oneshot_time wrong type
* Fix oneshot_time_layer wrong type
| -rw-r--r-- | tmk_core/common/action_util.c | 4 |
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; } void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; } void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; } #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) -static int16_t oneshot_time = 0; +static uint16_t oneshot_time = 0; bool has_oneshot_mods_timed_out(void) { return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; } @@ -79,7 +79,7 @@ inline uint8_t get_oneshot_layer(void) { return oneshot_layer_data >> 3; } inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; } #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) -static int16_t oneshot_layer_time = 0; +static uint16_t oneshot_layer_time = 0; inline bool has_oneshot_layer_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED); |