From b7468905a1dc56c49e12fae6ee448bbc55439209 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 1 May 2024 21:03:28 -0500 Subject: [PATCH] Reverting back to mouse combos - It didn't feel right having to hold down a key to get more mouse keys --- users/t4corun/config/combo_config.h | 2 +- users/t4corun/features/combo.c | 17 +++-------------- users/t4corun/features/combo.h | 16 ++++------------ users/t4corun/t4corun.h | 28 ++++++++++++++++++++-------- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/users/t4corun/config/combo_config.h b/users/t4corun/config/combo_config.h index 6fe4a873..81927ceb 100644 --- a/users/t4corun/config/combo_config.h +++ b/users/t4corun/config/combo_config.h @@ -25,7 +25,7 @@ #define COMBO_ONLY_FROM_LAYER 0 //this will always setup combos based off of QWERTY layout #define EXTRA_SHORT_COMBOS -#define COMBO_TERM 20 +#define COMBO_TERM 25 #define COMBO_TERM_PER_COMBO #define COMBO_HOLD_TERM TAPPING_TERM diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c index 62bae19a..0e0a5a9a 100644 --- a/users/t4corun/features/combo.c +++ b/users/t4corun/features/combo.c @@ -4,11 +4,6 @@ uint16_t get_combo_term(uint16_t index, combo_t *combo) { // or with combo index, i.e. its name from enum. switch (index) { - /* - case LYR_CONFIG: - return COMBO_HOLD_TERM + 100; - */ - default: return COMBO_TERM; @@ -19,14 +14,14 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) { switch (index) { -/* + #if defined(MOUSEKEY_ENABLE) case MOUSE_BUTTON3: case MOUSE_BUTTON4: case MOUSE_BUTTON5: case MOUSE_DRGTOG: #endif //MOUSEKEY_ENABLE -*/ + case KEY_ESC: case KEY_ENT: case KEY_TAB: @@ -40,11 +35,6 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) { bool get_combo_must_hold(uint16_t index, combo_t *combo) { switch (index) { -/* - case LYR_CONFIG: - return true; -*/ - default: return false; } @@ -82,7 +72,6 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode } break; -/* case MOUSE_BUTTON1: case MOUSE_BUTTON2: case MOUSE_BUTTON3: @@ -95,7 +84,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode return false; } break; -*/ + } diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h index b6d0494e..e57b5828 100644 --- a/users/t4corun/features/combo.h +++ b/users/t4corun/features/combo.h @@ -3,7 +3,6 @@ enum combos { -/* #if defined(MOUSEKEY_ENABLE) MOUSE_BUTTON1, MOUSE_BUTTON2, @@ -12,14 +11,12 @@ enum combos { MOUSE_BUTTON5, MOUSE_DRGTOG, #endif //MOUSEKEY_ENABLE -*/ KEY_ESC, KEY_ENT, KEY_TAB, KEY_DEL, KEY_BSPC, -// LYR_CONFIG, COMBO_LENGTH }; @@ -27,29 +24,25 @@ enum combos { //their documentation is so confusing because you don't use COMBO_LEN defining the actions uint16_t COMBO_LEN = COMBO_LENGTH; -/* + #if defined(MOUSEKEY_ENABLE) const uint16_t PROGMEM mou_btn1_combo[] = { KC_D, KC_F, COMBO_END }; const uint16_t PROGMEM mou_btn2_combo[] = { KC_S, KC_D, COMBO_END }; -const uint16_t PROGMEM mou_btn3_combo[] = { KC_F, KC_G, COMBO_END }; +const uint16_t PROGMEM mou_btn3_combo[] = { KC_G, KC_B, COMBO_END }; const uint16_t PROGMEM mou_btn4_combo[] = { KC_F, KC_R, COMBO_END }; const uint16_t PROGMEM mou_btn5_combo[] = { KC_T, KC_G, COMBO_END }; -const uint16_t PROGMEM mou_drg_combo[] = { KC_C, KC_V, COMBO_END }; +const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_C, COMBO_END }; #endif //MOUSEKEY_ENABLE -*/ + const uint16_t PROGMEM key_esc_combo[] = { KC_Q, KC_W, COMBO_END }; const uint16_t PROGMEM key_ent_combo[] = { KC_C, KC_V, COMBO_END }; const uint16_t PROGMEM key_tab_combo[] = { KC_U, KC_I, COMBO_END }; const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END }; const uint16_t PROGMEM key_del_combo[] = { TR_COMM, TR_DOT, COMBO_END }; -//const uint16_t PROGMEM lyr_cfg_combo[] = { TR_LSFT, KC_SPC, COMBO_END }; - - combo_t key_combos[COMBO_LENGTH] = { -/* #if defined(MOUSEKEY_ENABLE) [MOUSE_BUTTON1] = COMBO(mou_btn1_combo, TR_BTN1), [MOUSE_BUTTON2] = COMBO(mou_btn2_combo, TR_BTN2), @@ -58,7 +51,6 @@ combo_t key_combos[COMBO_LENGTH] = { [MOUSE_BUTTON5] = COMBO(mou_btn5_combo, TR_BTN5), [MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS), #endif //MOUSEKEY_ENABLE -*/ [KEY_ESC] = COMBO(key_esc_combo, KC_ESC), [KEY_ENT] = COMBO(key_ent_combo, KC_ENT), diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index 9376caf1..d68eb872 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -58,11 +58,8 @@ enum keycodes { #define SC_UNDO LCTL(KC_Z) #define SC_PAST LCTL(KC_V) #define SC_REDO LCTL(KC_Y) - -/* #define SC_SNIP LGUI(LSFT(KC_S)) #define SC_FILE LGUI(KC_E) -*/ // Zoom for encoders #define ZOOMIN LCTL(LSFT(KC_EQL)) @@ -75,7 +72,6 @@ enum keycodes { - We will only define things that are used across different layers. Entire layers are turned off in the keymap */ - // one shot mods #define TR_LSFT OSM(MOD_LSFT) #define TR_LCTL OSM(MOD_LCTL) @@ -222,12 +218,12 @@ enum keycodes { ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, TR_MWHU, ___x___, TR_SNIP, TR_SDPI, TR_PDPI, \ KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, TR_MWHD, _SCAG_MODS________________________, \ _UCCPR_L___________________________________, CONFIG, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ - ZOOMRST, _______, KC_ENT, _LAYER_TRANS_____________ + ZOOMRST, _______, KC_SPC, _LAYER_TRANS_____________ #define LAYER_NUMBER \ - TR_BTN5, TR_BTN3, TR_BTN2, TR_BTN1, TR_BTN4, ___x___, KC_7, KC_8, KC_9, KC_COMM, \ - _GACS_MODS________________________, TR_DRGS, ___x___, KC_4, KC_5, KC_6, KC_DOT, \ + ___x___, SC_SNIP, SC_FILE, ___x___, ___x___, ___x___, KC_7, KC_8, KC_9, KC_COMM, \ + _GACS_MODS________________________, ___x___, ___x___, KC_4, KC_5, KC_6, KC_DOT, \ _UCCPR_L___________________________________, ___x___, KC_1, KC_2, KC_3, TR_MINS, \ _LAYER_TRANS_____________, _BASE_ZERO_R4____________ @@ -241,7 +237,7 @@ enum keycodes { #define LAYER_CONFIG \ KC_F10, KC_F7, KC_F8, KC_F9, ___x___, ___x___, ___x___, ___x___, EE_CLR, QK_BOOT, \ - KC_F11, KC_F4, KC_F5, KC_F6, ___x___, ___x___, TR_LSFT, ___x___, ___x___, ___x___, \ + KC_F11, KC_F4, KC_F5, KC_F6, ___x___, ___x___, TR_LSFT, ___x___, ___x___, TR_RMOD, \ KC_F12, KC_F1, KC_F2, KC_F3, ___x___, _______, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, \ BASELYR, TR_DMR1, TR_DMP1, TR_RMOD, _______, TR_RTOG @@ -253,4 +249,20 @@ If I was going to combine number and symbols together, it'd look like this _GACS_MODS________________________, TR_GRV, TR_SCLN, KC_4, KC_5, KC_6, TR_EQL, \ _UCCPR_L___________________________________, KC_SLSH, KC_1, KC_2, KC_3, KC_BSLS, \ _LAYER_TRANS_____________, KC_SPC, NAV_0, ___x___ + + +nav and the N key together for config (not using combo) +- move all the rgb settings over one +- move rgb toggle to right encoder press +- move baselyr to left encoder press + +If we want to get rid of the mouse combos +- put all the mouse buttons on the top number layer row +- get rid of snipping tool and file explorer shortcuts +- 53214 is the button layout +- drag scroll toggle goes left of shift maybe + +if i want to force the use of enter combo +- i have to remove it from the navigation layer + */ \ No newline at end of file