summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-25 12:14:17 +0000
committerQMK Bot <hello@qmk.fm>2021-03-25 12:14:17 +0000
commit5a0be4c6d8dad8cc8b4b1404678c69ed4334cba0 (patch)
tree0a0fba0500632b83c0ea44171d393fc7a51a714c
parent2df1b124a72fa02bfa5cb0db9752a64097b5ff9e (diff)
parent5c1442766c10e98a0152b847ccf4d48899558cea (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--tmk_core/common/action_tapping.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c
index fe545c79a0..25b200448f 100644
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@@ -121,12 +121,20 @@ bool process_tapping(keyrecord_t *keyp) {
*/
# if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY)
else if (
+ ((
# ifdef TAPPING_TERM_PER_KEY
- (get_tapping_term(get_event_keycode(tapping_key.event, false), keyp) >= 500) &&
+ get_tapping_term(get_event_keycode(tapping_key.event, false), keyp)
+# else
+ TAPPING_TERM
# endif
+ >= 500 )
+
# ifdef PERMISSIVE_HOLD_PER_KEY
- !get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp) &&
+ || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp)
+# elif defined(PERMISSIVE_HOLD)
+ || true
# endif
+ ) &&
IS_RELEASED(event) && waiting_buffer_typed(event)) {
debug("Tapping: End. No tap. Interfered by typing key\n");
process_record(&tapping_key);