From 5c1442766c10e98a0152b847ccf4d48899558cea Mon Sep 17 00:00:00 2001 From: purple-rw <32964049+purple-rw@users.noreply.github.com> Date: Thu, 25 Mar 2021 05:13:41 -0700 Subject: [PATCH] fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TERM_PER_KEY are defined (#12125) Co-authored-by: checyr <32964049+checyr@users.noreply.github.com> --- tmk_core/common/action_tapping.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index fe545c79a06..25b200448f8 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);