diff options
| author | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-12 20:58:36 -0700 |
|---|---|---|
| committer | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-12 20:58:36 -0700 |
| commit | 73625a603afd14ee506d1562ef5f6a199eac62ce (patch) | |
| tree | 669ed65bd1962936e13aec3f62ee375fbbe09df7 /tmk_core | |
| parent | 91b11bb4dd9a0c94fbc0feb6915acc4717357205 (diff) | |
| parent | d3301c0f8b0005738ab9aa2030d83739ffb5c4b6 (diff) | |
Merge branch 'master' into miuni32-OA
Diffstat (limited to 'tmk_core')
| -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 |