diff options
| author | jpetermans <tibcmhhm@gmail.com> | 2017-05-24 11:51:20 -0700 |
|---|---|---|
| committer | jpetermans <tibcmhhm@gmail.com> | 2017-05-24 11:51:20 -0700 |
| commit | 2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7 (patch) | |
| tree | 289d5cce94ad5883741f0b637749d87680c14d33 /tmk_core/common/action_util.c | |
| parent | d89114400c398b900e27bf324a7973d1e0f25e58 (diff) | |
| parent | 7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff) | |
Merge remote-tracking branch 'upstream/master' into infinity60
Diffstat (limited to 'tmk_core/common/action_util.c')
| -rw-r--r-- | tmk_core/common/action_util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index cb4b252648..77848c0923 100644 --- a/tmk_core/common/action_util.c +++ b/tmk_core/common/action_util.c @@ -58,9 +58,13 @@ 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; -inline bool has_oneshot_mods_timed_out() { +bool has_oneshot_mods_timed_out(void) { return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; } +#else +bool has_oneshot_mods_timed_out(void) { + return false; +} #endif #endif |