diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-03-28 08:59:29 +0200 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2017-04-09 17:34:59 +0200 |
| commit | 6039a4f6edefbad7604a9533d445091cd646f240 (patch) | |
| tree | 91f461fc148c491a7f04b07121cbd011d262b3ec /tmk_core/common | |
| parent | f5c89416527a3ec435ed49137fd2bf4af216024c (diff) | |
| download | qmk_firmware-6039a4f6edefbad7604a9533d445091cd646f240.tar.gz qmk_firmware-6039a4f6edefbad7604a9533d445091cd646f240.tar.xz | |
Empty implementation of has_onshot_mods_timed_out
When the timeout is zero or not defined, the function now returns false.
Fixes a linker error when the visualizer is enabled
Diffstat (limited to 'tmk_core/common')
| -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 cb4b25264..77848c092 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 |