aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common/action_util.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-04-12 12:43:46 -0400
committerGitHub <noreply@github.com>2017-04-12 12:43:46 -0400
commite5f610b70ec124da411dd8b32c5a4de14b2bedc8 (patch)
tree85590469e36f6da98d8606d725bebaf78cbf7444 /tmk_core/common/action_util.c
parent154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff)
parent1d5567a3a9ae1ca45bd5ff09f21edb7d1388afc3 (diff)
downloadqmk_firmware-e5f610b70ec124da411dd8b32c5a4de14b2bedc8.tar.gz
qmk_firmware-e5f610b70ec124da411dd8b32c5a4de14b2bedc8.zip
Merge pull request #1217 from fredizzimo/ergodox_default_visualizer
Enable Ergodox Infinity LCD visualization
Diffstat (limited to 'tmk_core/common/action_util.c')
-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 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; }
58void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; } 58void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; }
59#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) 59#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
60static int16_t oneshot_time = 0; 60static int16_t oneshot_time = 0;
61inline bool has_oneshot_mods_timed_out() { 61bool has_oneshot_mods_timed_out(void) {
62 return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; 62 return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
63} 63}
64#else
65bool has_oneshot_mods_timed_out(void) {
66 return false;
67}
64#endif 68#endif
65#endif 69#endif
66 70