diff options
author | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
---|---|---|
committer | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
commit | 62faa20ef6ddab7dacc74123b2253cf25b5c20f7 (patch) | |
tree | 281ae30283f7491b2529465da4897dc2ddd7088c /tmk_core/common/action_tapping.c | |
parent | d5ee0194abf5cc9df4086a89ad78cf188352028a (diff) | |
parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'tmk_core/common/action_tapping.c')
-rw-r--r-- | tmk_core/common/action_tapping.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index e16e11be7f..bd9a69ae0a 100644 --- a/tmk_core/common/action_tapping.c +++ b/tmk_core/common/action_tapping.c @@ -228,6 +228,7 @@ bool process_tapping(keyrecord_t *keyp) if (WITHIN_TAPPING_TERM(event)) { if (event.pressed) { if (IS_TAPPING_KEY(event.key)) { +#ifndef TAPPING_FORCE_HOLD if (!tapping_key.tap.interrupted && tapping_key.tap.count > 0) { // sequential tap. keyp->tap = tapping_key.tap; @@ -237,11 +238,11 @@ bool process_tapping(keyrecord_t *keyp) tapping_key = *keyp; debug_tapping_key(); return true; - } else { - // FIX: start new tap again - tapping_key = *keyp; - return true; } +#endif + // FIX: start new tap again + tapping_key = *keyp; + return true; } else if (is_tap_key(event.key)) { // Sequential tap can be interfered with other tap key. debug("Tapping: Start with interfering other tap.\n"); @@ -257,7 +258,7 @@ bool process_tapping(keyrecord_t *keyp) return true; } } else { - if (!IS_NOEVENT(event)) debug("Tapping: other key just after tap.\n") {}; + if (!IS_NOEVENT(event)) debug("Tapping: other key just after tap.\n"); process_record(keyp); return true; } |