diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-03-28 15:24:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 15:24:22 +0200 |
| commit | 216f669276b30393fb35a409011ccdad8b521156 (patch) | |
| tree | a26991d2e44ecb1ed6247eb011d7f6e0ca78741b /tmk_core | |
| parent | cc2fb56ed837d60a959938d2d89fce62a99cd3bc (diff) | |
| parent | 64f9779fe54facecdef9d1a6a7c1d893f79ca20e (diff) | |
| download | qmk_firmware-216f669276b30393fb35a409011ccdad8b521156.tar.gz qmk_firmware-216f669276b30393fb35a409011ccdad8b521156.tar.xz | |
Merge pull request #1098 from lambdalisue/tapping-force-hold
Add TAPPING_FORCE_HOLD to regulate behaviour
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action_tapping.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index ff78d7f2a..bd9a69ae0 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"); |