From cbabc8dbe6a8476d3082e8bc649d330f87e7b904 Mon Sep 17 00:00:00 2001 From: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Mon, 12 Dec 2022 23:52:22 +0800 Subject: [Core] Replace Tapping Force Hold feature with Quick Tap Term (#17007) * Replace Tapping Force Hold feature with Quick Tap Term * Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0 * Deprecate force hold in info_config.json * Before and after quick tap term unit tests * Quick tap unit tests iteration * Keymap config.h correction * Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed * Add two more test cases for quick tap * Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2 * Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2 * Add function declaration for get_quick_tap_term Co-authored-by: Stefan Kerkmann --- users/uqs/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/uqs') diff --git a/users/uqs/config.h b/users/uqs/config.h index 4bb793532b..455aae9da8 100644 --- a/users/uqs/config.h +++ b/users/uqs/config.h @@ -15,7 +15,7 @@ #define TAPPING_TOGGLE 2 // number of taps for a toggle-on-tap #define TAPPING_TERM 170 // ms to trigger tap // https://precondition.github.io/home-row-mods -#define TAPPING_FORCE_HOLD // make tap-then-hold _not_ do key auto repeat +#define QUICK_TAP_TERM 0 // make tap-then-hold _not_ do key auto repeat #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD // I don't think this works for me, hence I rolled my own implementation. -- cgit v1.2.3 From 9e4cfcd181a87c4f8adfaef5a766f788263ff60a Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 14 Dec 2022 13:44:36 +1100 Subject: UCIS: remove `qk_` prefix (#19302) --- users/uqs/uqs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'users/uqs') diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c index 82cf70c439..bccab617ac 100644 --- a/users/uqs/uqs.c +++ b/users/uqs/uqs.c @@ -543,7 +543,7 @@ void matrix_scan_user(void) { #ifdef UCIS_ENABLE SEQ_ONE_KEY(KC_U) { - qk_ucis_start(); + ucis_start(); } #endif SEQ_ONE_KEY(KC_H) { @@ -576,7 +576,7 @@ void matrix_scan_user(void) { #ifdef UCIS_ENABLE // 3 codepoints at most, otherwise increase UCIS_MAX_CODE_POINTS -const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE( +const ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE( UCIS_SYM("poop", 0x1F4A9), // 💩 UCIS_SYM("rofl", 0x1F923), // 🤣 UCIS_SYM("look", 0x0CA0, 0x005F, 0x0CA0) // ಠ_ಠ -- cgit v1.2.3 From bbf7a20b33de2d203518687cb5cd1aa85005ea27 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 13 Feb 2023 03:19:02 +1100 Subject: Refactor Leader key feature (#19632) Co-authored-by: Drashna Jaelre --- users/uqs/uqs.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) (limited to 'users/uqs') diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c index bccab617ac..83733bbe2a 100644 --- a/users/uqs/uqs.c +++ b/users/uqs/uqs.c @@ -534,43 +534,36 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } #ifdef LEADER_ENABLE -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - +void leader_end_user(void) { #ifdef UCIS_ENABLE - SEQ_ONE_KEY(KC_U) { - ucis_start(); + if (leader_sequence_one_key(KC_U)) { + ucis_start(); } #endif - SEQ_ONE_KEY(KC_H) { - send_unicode_string("ᕕ( ᐛ )ᕗ"); // happy + if (leader_sequence_one_key(KC_H)) { + send_unicode_string("ᕕ( ᐛ )ᕗ"); // happy } - SEQ_ONE_KEY(KC_D) { - send_unicode_string("ಠ_ಠ"); // disapproval + if (leader_sequence_one_key(KC_D)) { + send_unicode_string("ಠ_ಠ"); // disapproval } - SEQ_ONE_KEY(KC_L) { - send_unicode_string("( ͡° ͜ʖ ͡°)"); // lenny + if (leader_sequence_one_key(KC_L)) { + send_unicode_string("( ͡° ͜ʖ ͡°)"); // lenny } - SEQ_ONE_KEY(KC_S) { - send_unicode_string("¯\\_(ツ)_/¯"); // shrug + if (leader_sequence_one_key(KC_S)) { + send_unicode_string("¯\\_(ツ)_/¯"); // shrug } // tableflip (LEADER - TF) - SEQ_TWO_KEYS(KC_T, KC_F) { - //set_unicode_input_mode(UNICODE_MODE_LINUX); - //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); - send_unicode_string("(╯°□°)╯︵ ┻━┻"); + if (leader_sequence_two_keys(KC_T, KC_F)) { + //set_unicode_input_mode(UNICODE_MODE_LINUX); + //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); + send_unicode_string("(╯°□°)╯︵ ┻━┻"); } // untableflip - SEQ_THREE_KEYS(KC_U, KC_T, KC_F) { - //set_unicode_input_mode(UNICODE_MODE_LINUX); - //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); - send_unicode_string("┬─┬ノ( º _ ºノ)"); + if (leader_sequence_three_keys(KC_U, KC_T, KC_F)) { + //set_unicode_input_mode(UNICODE_MODE_LINUX); + //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); + send_unicode_string("┬─┬ノ( º _ ºノ)"); } - } } #endif -- cgit v1.2.3