Big changes

- Removed all the mouse and config combos
- Added all the mouse buttons to the number layer
- removed the snipping tool and file explorer shortcut
- redid the config layer for the new activation
This commit is contained in:
Victor 2024-05-01 19:57:17 -05:00
parent 6344f4eec6
commit 69bfe86bb7
Failed to generate hash of commit
5 changed files with 31 additions and 19 deletions

View file

@ -3,11 +3,12 @@
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;
@ -18,13 +19,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:
@ -38,8 +40,10 @@ 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;
@ -78,6 +82,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
}
break;
/*
case MOUSE_BUTTON1:
case MOUSE_BUTTON2:
case MOUSE_BUTTON3:
@ -91,6 +96,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
}
break;
}
*/
return true;
}

View file

@ -25,7 +25,7 @@ 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 };
@ -34,19 +34,20 @@ 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 };
#endif //MOUSEKEY_ENABLE
*/
const uint16_t PROGMEM key_esc_combo[] = { KC_Q, KC_W, COMBO_END };
const uint16_t PROGMEM key_ent_combo[] = { KC_X, KC_C, 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 };
//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),
@ -55,13 +56,14 @@ 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),
[KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
[KEY_DEL] = COMBO(key_del_combo, KC_DEL),
[KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC),
[LYR_CONFIG] = COMBO(lyr_cfg_combo, CONFIG)
//[LYR_CONFIG] = COMBO(lyr_cfg_combo, CONFIG)
};

View file

@ -21,7 +21,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case NAV_0:
return TAPPING_TERM - 80;
return TAPPING_TERM - 60;
default:
//uprintf("tapping term: %d \n", TAPPING_TERM);