summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-03-28 09:59:29 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-04-09 18:34:59 +0300
commit6039a4f6edefbad7604a9533d445091cd646f240 (patch)
tree91f461fc148c491a7f04b07121cbd011d262b3ec
parentf5c89416527a3ec435ed49137fd2bf4af216024c (diff)
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
-rw-r--r--tmk_core/common/action_util.c6
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