From 33be21734fea347bf13fdbcec884c84287cc1e82 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 20 Apr 2024 15:14:45 -0500 Subject: [PATCH] Addtional Tweaks to combos - Moved the backspace / delete combos to the top - removed contrl backspace shortcuts - Adjusted keymap.yaml --- keymap-drawer.yml | 11 ++++++----- users/t4corun/features/combo.h | 17 +++++++---------- users/t4corun/t4corun.h | 5 +---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/keymap-drawer.yml b/keymap-drawer.yml index 6298163b..830822c1 100644 --- a/keymap-drawer.yml +++ b/keymap-drawer.yml @@ -89,11 +89,12 @@ combos: - { p: [12, 13], k: MB1, l: [base_QWERTY] } - { p: [13, 14], k: MB3, l: [base_QWERTY] } - { p: [11, 12], k: DrgScr Tog, l: [base_QWERTY] } - - { p: [16, 17], k: Tab, l: [base_QWERTY] } + - { p: [26, 27], k: Tab, l: [base_QWERTY] } - { p: [21, 22], k: Enter, l: [base_QWERTY] } - { p: [22, 23], k: MB2, l: [base_QWERTY] } - - { p: [26, 27], k: Bksp, l: [base_QWERTY] } - - { p: [27, 28], k: Del, l: [base_QWERTY] } - - { p: [26, 28], k: Bwrd, l: [base_QWERTY], align: bottom, offset: 0.1 } + - { p: [7, 8], k: Bksp, l: [base_QWERTY] } + - { p: [6, 7], k: Del, l: [base_QWERTY] } - { p: [31, 32], k: FUNC, l: [base_QWERTY], align: top } - - { p: [33, 34], k: CONFIG, l: [base_QWERTY], align: top } \ No newline at end of file + - { p: [33, 34], k: CONFIG, l: [base_QWERTY], align: top } +draw_config: + small_pad: 6 diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h index 18aa13b1..1096fc69 100644 --- a/users/t4corun/features/combo.h +++ b/users/t4corun/features/combo.h @@ -21,7 +21,6 @@ enum combos { KEY_TAB, KEY_DEL, KEY_BSPC, - KEY_BWRD, LYR_CONFIG, COMBO_LENGTH @@ -38,17 +37,16 @@ const uint16_t PROGMEM mou_btn5_combo[] = { KC_R, KC_T, COMBO_END }; const uint16_t PROGMEM mou_drg_combo[] = { KC_S, KC_D, COMBO_END }; #endif //MOUSEKEY_ENABLE -const uint16_t PROGMEM key_esc_combo[] = { KC_W, KC_E, COMBO_END }; -const uint16_t PROGMEM key_ent_combo[] = { KC_X, KC_C, COMBO_END }; -const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END }; +const uint16_t PROGMEM key_esc_combo[] = { KC_W, KC_E, COMBO_END }; +const uint16_t PROGMEM key_ent_combo[] = { KC_X, KC_C, COMBO_END }; +const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END }; // right hand combos -const uint16_t PROGMEM key_tab_combo[] = { KC_J, KC_K, COMBO_END }; -const uint16_t PROGMEM key_del_combo[] = { TR_COMM, TR_DOT, COMBO_END }; -const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END }; -const uint16_t PROGMEM key_bwrd_combo[] = { KC_M, TR_DOT, COMBO_END }; -const uint16_t PROGMEM lyr_cfg_combo[] = { KC_SPC, NAV, COMBO_END }; +const uint16_t PROGMEM key_tab_combo[] = { KC_M, TR_COMM, COMBO_END }; +const uint16_t PROGMEM key_del_combo[] = { KC_U, KC_I, COMBO_END }; +const uint16_t PROGMEM key_bspc_combo[] = { KC_I, KC_O, COMBO_END }; +const uint16_t PROGMEM lyr_cfg_combo[] = { KC_SPC, NAV, COMBO_END }; @@ -72,7 +70,6 @@ combo_t key_combos[COMBO_LENGTH] = { [KEY_TAB] = COMBO(key_tab_combo, KC_TAB), [KEY_DEL] = COMBO(key_del_combo, KC_DEL), [KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC), - [KEY_BWRD] = COMBO(key_bwrd_combo, BACKWRD), [LYR_CONFIG] = COMBO(lyr_cfg_combo, CONFIG) }; diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index a629542d..eb1a9c94 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -56,14 +56,11 @@ enum keycodes { #define SC_SNIP LGUI(LSFT(KC_S)) #define SC_FILE LGUI(KC_E) -// Zoom +// Zoom for encoders #define ZOOMIN LCTL(LSFT(KC_EQL)) #define ZOOMOUT LCTL(KC_MINS) #define ZOOMRST LCTL(KC_0) -// Macros -#define BACKWRD LCTL(KC_BSPC) - /* - Any keycodes with prefix TR has behavior dependent on if the feature is enabled. - If the feature is disabled then the key is just the normal key