From de30ee697d217046ab2f40186642913de710c8b3 Mon Sep 17 00:00:00 2001 From: Jaeseok Lee Date: Mon, 13 Jan 2025 00:04:27 +0900 Subject: [PATCH] fix tapping force hold to use quick tap term internally --- builddefs/build_vial.mk | 2 +- quantum/qmk_settings.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/builddefs/build_vial.mk b/builddefs/build_vial.mk index ce31d295625..894943d3335 100644 --- a/builddefs/build_vial.mk +++ b/builddefs/build_vial.mk @@ -25,7 +25,7 @@ ifeq ($(strip $(QMK_SETTINGS)), yes) SRC += $(QUANTUM_DIR)/qmk_settings.c OPT_DEFS += -DQMK_SETTINGS \ -DAUTO_SHIFT_NO_SETUP -DAUTO_SHIFT_REPEAT_PER_KEY -DAUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY \ - -DPERMISSIVE_HOLD_PER_KEY -DHOLD_ON_OTHER_KEY_PRESS_PER_KEY -DTAPPING_FORCE_HOLD_PER_KEY -DRETRO_TAPPING_PER_KEY \ + -DPERMISSIVE_HOLD_PER_KEY -DHOLD_ON_OTHER_KEY_PRESS_PER_KEY -DQUICK_TAP_TERM_PER_KEY -DRETRO_TAPPING_PER_KEY \ -DCOMBO_TERM_PER_COMBO endif diff --git a/quantum/qmk_settings.c b/quantum/qmk_settings.c index 96449220e2d..ce5e2ac1f56 100644 --- a/quantum/qmk_settings.c +++ b/quantum/qmk_settings.c @@ -268,8 +268,12 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { return !(QS.tapping & 2); } -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - return QS.tapping & 4; +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + if (QS.tapping & 4) { + return 0; + } else { + return QS.tapping_term; + } } bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {