mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-05 07:04:17 -04:00
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
parent
6344f4eec6
commit
69bfe86bb7
5 changed files with 31 additions and 19 deletions
|
|
@ -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 35
|
||||
#define COMBO_TERM 20
|
||||
#define COMBO_TERM_PER_COMBO
|
||||
|
||||
#define COMBO_HOLD_TERM TAPPING_TERM
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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)
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -58,8 +58,11 @@ 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))
|
||||
|
|
@ -188,6 +191,7 @@ enum keycodes {
|
|||
|
||||
#define _BASE_L4_________________ ___x___, NUM, TR_LSFT
|
||||
#define _BASE_R4_________________ KC_SPC, NAV, KC_MUTE
|
||||
#define _BASE_ZERO_R4____________ KC_SPC, NAV_0, KC_MUTE
|
||||
#define _LAYER_TRANS_____________ ___x___, _______, ___x___
|
||||
|
||||
|
||||
|
|
@ -211,21 +215,21 @@ enum keycodes {
|
|||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, KC_8, KC_9, KC_ESC, \
|
||||
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_4, KC_5, KC_6, KC_GRV, \
|
||||
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_1, KC_2, KC_3, CM_TOGG, \
|
||||
KC_ENT, KC_LSFT, KC_SPC, KC_SPC, NAV_0, KC_MUTE
|
||||
KC_ENT, KC_SPC, KC_LSFT, _BASE_ZERO_R4____________
|
||||
|
||||
|
||||
#define LAYER_NAVIGATION \
|
||||
___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___________________________________, ___x___, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \
|
||||
_UCCPR_L___________________________________, CONFIG, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \
|
||||
ZOOMRST, _______, KC_ENT, _LAYER_TRANS_____________
|
||||
|
||||
|
||||
#define LAYER_NUMBER \
|
||||
___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, \
|
||||
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, \
|
||||
_UCCPR_L___________________________________, ___x___, KC_1, KC_2, KC_3, TR_MINS, \
|
||||
_LAYER_TRANS_____________, KC_SPC, NAV_0, KC_MUTE
|
||||
_LAYER_TRANS_____________, _BASE_ZERO_R4____________
|
||||
|
||||
|
||||
#define LAYER_SYMBOL \
|
||||
|
|
@ -237,9 +241,9 @@ 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___, BASELYR, TR_LSFT, ___x___, ___x___, TR_RMOD, \
|
||||
KC_F12, KC_F1, KC_F2, KC_F3, ___x___, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, TR_RTOG, \
|
||||
___x___, TR_DMR1, ___x___, ___x___, TR_DMP1, ___x___
|
||||
KC_F11, KC_F4, KC_F5, KC_F6, ___x___, ___x___, TR_LSFT, ___x___, ___x___, ___x___, \
|
||||
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
|
||||
|
||||
/*
|
||||
If I was going to combine number and symbols together, it'd look like this
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue