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/drashna/config.h | 2 +- users/drashna/keyrecords/tapping.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'users/drashna') diff --git a/users/drashna/config.h b/users/drashna/config.h index 5c5c131e36..22c789b8c6 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -83,7 +83,7 @@ #if defined(PER_KEY_TAPPING) # define IGNORE_MOD_TAP_INTERRUPT_PER_KEY # define PERMISSIVE_HOLD_PER_KEY -# define TAPPING_FORCE_HOLD_PER_KEY +# define QUICK_TAP_TERM_PER_KEY # define HOLD_ON_OTHER_KEY # define RETRO_TAPPING_PER_KEY # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c index 7496610c2f..37945d2f67 100644 --- a/users/drashna/keyrecords/tapping.c +++ b/users/drashna/keyrecords/tapping.c @@ -57,14 +57,14 @@ __attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrec } #endif // IGNORE_MOD_TAP_INTERRUPT_PER_KEY -#ifdef TAPPING_FORCE_HOLD_PER_KEY -__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +#ifdef QUICK_TAP_TERM_PER_KEY +__attribute__((weak)) uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { default: - return false; + return QUICK_TAP_TERM; } } -#endif // TAPPING_FORCE_HOLD_PER_KEY +#endif // QUICK_TAP_TERM_PER_KEY #ifdef RETRO_TAPPING_PER_KEY __attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) { -- cgit v1.2.3 From 515dd18c2801663bbac0e59f683c2a93e4bd9b1a Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:20:07 +0100 Subject: Remove IGNORE_MOD_TAP_INTERRUPT_PER_KEY in favour of HOLD_ON_OTHER_KEY_PRESS_PER_KEY (#15741) --- users/drashna/config.h | 1 - users/drashna/keyrecords/tapping.c | 15 --------------- 2 files changed, 16 deletions(-) (limited to 'users/drashna') diff --git a/users/drashna/config.h b/users/drashna/config.h index 22c789b8c6..9edbfff56b 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -81,7 +81,6 @@ #endif // !ONESHOT_TIMEOUT #if defined(PER_KEY_TAPPING) -# define IGNORE_MOD_TAP_INTERRUPT_PER_KEY # define PERMISSIVE_HOLD_PER_KEY # define QUICK_TAP_TERM_PER_KEY # define HOLD_ON_OTHER_KEY diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c index 37945d2f67..6a26a02aca 100644 --- a/users/drashna/keyrecords/tapping.c +++ b/users/drashna/keyrecords/tapping.c @@ -42,21 +42,6 @@ __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyreco } #endif // HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY -__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - // Do not force the mod-tap key press to be handled as a modifier - // if any other key was pressed while the mod-tap key is held down. - // return true; - // Force the mod-tap key press to be handled as a modifier if any - // other key was pressed while the mod-tap key is held down. - // return false; - switch (keycode) { - default: - return true; - } -} -#endif // IGNORE_MOD_TAP_INTERRUPT_PER_KEY - #ifdef QUICK_TAP_TERM_PER_KEY __attribute__((weak)) uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { -- cgit v1.2.3 From 1978007faefc0fb3af809ddf0d2ff1274e540570 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 15 Dec 2022 07:40:25 +1100 Subject: Tap Dance: remove `qk_` prefix (#19313) --- users/drashna/keyrecords/tap_dance.md | 4 ++-- users/drashna/keyrecords/tap_dances.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'users/drashna') diff --git a/users/drashna/keyrecords/tap_dance.md b/users/drashna/keyrecords/tap_dance.md index fef1435918..9dff96640f 100644 --- a/users/drashna/keyrecords/tap_dance.md +++ b/users/drashna/keyrecords/tap_dance.md @@ -30,7 +30,7 @@ These are the custom defined dances that I'm using. It sets up everything for l ```c //Tap Dance Definitions, sets the index and the keycode. -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // tap once to disable, and more to enable timed micros [TD_D3_1] = ACTION_TAP_DANCE_DIABLO(0, KC_1), [TD_D3_2] = ACTION_TAP_DANCE_DIABLO(1, KC_2), @@ -82,7 +82,7 @@ The first part of the magic here is the `diablo_tapdance_master` function. The ```c // Cycle through the times for the macro, starting at 0, for disabled. -void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) { +void diablo_tapdance_master(tap_dance_state_t *state, void *user_data) { diable_keys_t *diablo_keys = (diable_keys_t *)user_data; // Sets the keycode based on the index diablo_timer[diablo_keys->index].keycode = diablo_keys->keycode; diff --git a/users/drashna/keyrecords/tap_dances.c b/users/drashna/keyrecords/tap_dances.c index 7bdea3cae3..87739c2a18 100644 --- a/users/drashna/keyrecords/tap_dances.c +++ b/users/drashna/keyrecords/tap_dances.c @@ -17,7 +17,7 @@ uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30}; * @param state Main data struction contining information about events * @param user_data Local data for the dance. Allows customization to be passed on to function */ -void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) { +void diablo_tapdance_master(tap_dance_state_t *state, void *user_data) { diable_keys_t *diablo_keys = (diable_keys_t *)user_data; // Sets the keycode based on the index diablo_timer[diablo_keys->index].keycode = diablo_keys->keycode; @@ -40,7 +40,7 @@ void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) { // clang-format on // Tap Dance Definitions, sets the index and the keycode. -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // tap once to disable, and more to enable timed micros [TD_D3_1] = ACTION_TAP_DANCE_DIABLO(0, KC_1), [TD_D3_2] = ACTION_TAP_DANCE_DIABLO(1, KC_2), -- cgit v1.2.3 From 043d8e1140e09327b72ed3bd55f369e1faf1a334 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 30 Jan 2023 03:44:16 +1100 Subject: Remove deprecated Quantum keycodes (#19712) --- users/drashna/keyrecords/wrappers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/drashna') diff --git a/users/drashna/keyrecords/wrappers.h b/users/drashna/keyrecords/wrappers.h index cb8dc6189a..31efad5f6e 100644 --- a/users/drashna/keyrecords/wrappers.h +++ b/users/drashna/keyrecords/wrappers.h @@ -256,7 +256,7 @@ NOTE: These are all the same length. If you do a search/replace #define _________________ADJUST_L1_________________ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG -#define _________________ADJUST_L2_________________ MU_TOG , CK_TOGG, AU_ON, AU_OFF, CG_NORM +#define _________________ADJUST_L2_________________ MU_TOGG, CK_TOGG, AU_ON, AU_OFF, CG_NORM #define _________________ADJUST_L3_________________ RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T #define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5 -- cgit v1.2.3 From 11d49d00e74618500e5c51e4c7f858eb906ccea8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 11 Feb 2023 03:47:17 +0000 Subject: Remove matrix_init_quantum/matrix_scan_quantum (#19806) --- users/drashna/callbacks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/drashna') diff --git a/users/drashna/callbacks.md b/users/drashna/callbacks.md index 5908a66142..e23f7f6d86 100644 --- a/users/drashna/callbacks.md +++ b/users/drashna/callbacks.md @@ -2,7 +2,7 @@ Specifically QMK works by using customized callback functions for everything. This allows for multiple levels of customization. -`matrix_scan` calls `matrix_scan_quantum`, which calls `matrix_scan_kb`, which calls `matrix_scan_user`. +`matrix_scan` calls `matrix_scan_kb`, which calls `matrix_scan_user`. `process_record` calls a bunch of stuff, but eventually calls `process_record_kb` which calls `process_record_user` The same goes for `matrix_init`, `layer_state_set`, `led_set`, and a few other functions. -- cgit v1.2.3 From 961f0b7b2de54f988daf4ce7b791f91a33e55612 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Feb 2023 22:49:07 +0000 Subject: Reallocate SAFE_RANGE (#19909) --- users/drashna/keyrecords/process_records.h | 10 +--------- users/drashna/pointing/pointing.c | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'users/drashna') diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h index 0acd7e010d..5c8fe889e4 100644 --- a/users/drashna/keyrecords/process_records.h +++ b/users/drashna/keyrecords/process_records.h @@ -4,16 +4,8 @@ #pragma once #include "drashna.h" -#if defined(KEYBOARD_handwired_tractyl_manuform) && defined(POINTING_DEVICE_ENABLE) -# define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE -#elif defined(KEYBOARD_bastardkb_charybdis) -# define PLACEHOLDER_SAFE_RANGE CHARYBDIS_SAFE_RANGE -#else -# define PLACEHOLDER_SAFE_RANGE SAFE_RANGE -#endif - enum userspace_custom_keycodes { - VRSN = PLACEHOLDER_SAFE_RANGE, // Prints QMK Firmware and board info + VRSN = SAFE_RANGE, // Prints QMK Firmware and board info KC_QWERTY, // Sets default layer to QWERTY FIRST_DEFAULT_LAYER_KEYCODE = KC_QWERTY, // Sets default layer to QWERTY KC_COLEMAK_DH, // Sets default layer to COLEMAK diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c index 1b64502ed3..a74c9fd41e 100644 --- a/users/drashna/pointing/pointing.c +++ b/users/drashna/pointing/pointing.c @@ -82,9 +82,9 @@ bool is_mouse_record_user(uint16_t keycode, keyrecord_t* record) { # if defined(KEYBOARD_ploopy) case DPI_CONFIG: # elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES) - case SAFE_RANGE ...(CHARYBDIS_SAFE_RANGE - 1): + case QK_KB ... QK_KB_MAX: # elif (defined(KEYBOARD_bastardkb_dilemma) && !defined(NO_DILEMMA_KEYCODES)) - case SAFE_RANGE ...(DILEMMA_SAFE_RANGE - 1): + case QK_KB ... QK_KB_MAX: # endif case KC_ACCEL: return true; -- cgit v1.2.3