diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-04-12 18:43:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 18:43:46 +0200 |
| commit | e5f610b70ec124da411dd8b32c5a4de14b2bedc8 (patch) | |
| tree | 85590469e36f6da98d8606d725bebaf78cbf7444 /tmk_core | |
| parent | 154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff) | |
| parent | 1d5567a3a9ae1ca45bd5ff09f21edb7d1388afc3 (diff) | |
| download | qmk_firmware-e5f610b70ec124da411dd8b32c5a4de14b2bedc8.tar.gz qmk_firmware-e5f610b70ec124da411dd8b32c5a4de14b2bedc8.tar.xz | |
Merge pull request #1217 from fredizzimo/ergodox_default_visualizer
Enable Ergodox Infinity LCD visualization
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 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 |