mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-05-05 07:04:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying Callum after my Swoop got stuck in game mode

Browse source 
- reshuffling everything to somewhat match his keymap
- removed a bunch of combos
This commit is contained in:
Victor 2024-05-05 20:27:25 -05:00
parent e6fae5e3b1
commit 39ca5f2f73
Failed to generate hash of commit
11 changed files with 48 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

8
keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c
View file

@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_2] = ROLLOW(LAYER_COLEMAK_DH), [_DEFAULT_LAYER_2] = ROLLOW(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = ROLLOW(LAYER_GAME), [_DEFAULT_LAYER_3] = ROLLOW(LAYER_GAME),
[_NAVIGATION] = ROLLOW(LAYER_NAVIGATION), [_NAVIGATION] = ROLLOW(LAYER_NAVIGATION),
[_NUMBER] = ROLLOW(LAYER_NUMBER),
[_SYMBOL] = ROLLOW(LAYER_SYMBOL), [_SYMBOL] = ROLLOW(LAYER_SYMBOL),
[_NUMBER] = ROLLOW(LAYER_NUMBER),
[_CONFIG] = ROLLOW(LAYER_CONFIG) [_CONFIG] = ROLLOW(LAYER_CONFIG)
}; };
@ -38,9 +38,9 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
[_CONFIG] = { ENCODER_CCW_CW(TR_RMOD, TR_RRMD), ENCODER_CCW_CW(BASELYR, RBSELYR) } [_CONFIG] = { ENCODER_CCW_CW(BASELYR, RBSELYR), ENCODER_CCW_CW(TR_RMOD, TR_RRMD) }
}; };
#endif #endif

2
keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c
View file

@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_2] = CNANO(LAYER_COLEMAK_DH), [_DEFAULT_LAYER_2] = CNANO(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = CNANO(LAYER_GAME), [_DEFAULT_LAYER_3] = CNANO(LAYER_GAME),
[_NAVIGATION] = CNANO(LAYER_NAVIGATION), [_NAVIGATION] = CNANO(LAYER_NAVIGATION),
[_NUMBER] = CNANO(LAYER_NUMBER),
[_SYMBOL] = CNANO(LAYER_SYMBOL), [_SYMBOL] = CNANO(LAYER_SYMBOL),
[_NUMBER] = CNANO(LAYER_NUMBER),
[_CONFIG] = CNANO(LAYER_CONFIG) [_CONFIG] = CNANO(LAYER_CONFIG)
}; };

8
keyboards/bluebell/swoop/keymaps/t4corun/keymap.c
View file

@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_2] = SWOOP(LAYER_COLEMAK_DH), [_DEFAULT_LAYER_2] = SWOOP(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = SWOOP(LAYER_GAME), [_DEFAULT_LAYER_3] = SWOOP(LAYER_GAME),
[_NAVIGATION] = SWOOP(LAYER_NAVIGATION), [_NAVIGATION] = SWOOP(LAYER_NAVIGATION),
[_NUMBER] = SWOOP(LAYER_NUMBER),
[_SYMBOL] = SWOOP(LAYER_SYMBOL), [_SYMBOL] = SWOOP(LAYER_SYMBOL),
[_NUMBER] = SWOOP(LAYER_NUMBER),
[_CONFIG] = SWOOP(LAYER_CONFIG) [_CONFIG] = SWOOP(LAYER_CONFIG)
}; };
@ -38,9 +38,9 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMOUT, ZOOMIN), ENCODER_CCW_CW(___x___, ___x___) }, [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMOUT, ZOOMIN), ENCODER_CCW_CW(___x___, ___x___) },
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
[_CONFIG] = { ENCODER_CCW_CW(TR_RRMD, TR_RMOD), ENCODER_CCW_CW(RBSELYR, BASELYR) } [_CONFIG] = { ENCODER_CCW_CW(RBSELYR, BASELYR), ENCODER_CCW_CW(TR_RRMD, TR_RMOD) }
}; };
#endif //ENCODER_MAP_ENABLE #endif //ENCODER_MAP_ENABLE

2
keyboards/crkbd/keymaps/t4corun/keymap.c
View file

@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_2] = CRKBD(LAYER_COLEMAK_DH), [_DEFAULT_LAYER_2] = CRKBD(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = CRKBD(LAYER_GAME), [_DEFAULT_LAYER_3] = CRKBD(LAYER_GAME),
[_NAVIGATION] = CRKBD(LAYER_NAVIGATION), [_NAVIGATION] = CRKBD(LAYER_NAVIGATION),
[_NUMBER] = CRKBD(LAYER_NUMBER),
[_SYMBOL] = CRKBD(LAYER_SYMBOL), [_SYMBOL] = CRKBD(LAYER_SYMBOL),
[_NUMBER] = CRKBD(LAYER_NUMBER),
[_CONFIG] = CRKBD(LAYER_CONFIG) [_CONFIG] = CRKBD(LAYER_CONFIG)
}; };

2
keyboards/planck/keymaps/t4corun/keymap.c
View file

@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DEFAULT_LAYER_2] = PLANCK(LAYER_COLEMAK_DH), [_DEFAULT_LAYER_2] = PLANCK(LAYER_COLEMAK_DH),
[_DEFAULT_LAYER_3] = PLANCK(LAYER_GAME), [_DEFAULT_LAYER_3] = PLANCK(LAYER_GAME),
[_NAVIGATION] = PLANCK(LAYER_NAVIGATION), [_NAVIGATION] = PLANCK(LAYER_NAVIGATION),
[_NUMBER] = PLANCK(LAYER_NUMBER),
[_SYMBOL] = PLANCK(LAYER_SYMBOL), [_SYMBOL] = PLANCK(LAYER_SYMBOL),
[_NUMBER] = PLANCK(LAYER_NUMBER),
[_CONFIG] = PLANCK(LAYER_CONFIG) [_CONFIG] = PLANCK(LAYER_CONFIG)
}; };

20
users/t4corun/features/combo.c
View file

@ -9,12 +9,8 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
case MOUSE_BUTTON4: case MOUSE_BUTTON4:
case MOUSE_BUTTON5: case MOUSE_BUTTON5:
case MOUSE_DRGTOG: case MOUSE_DRGTOG:
#endif //MOUSEKEY_ENABLEdf
case KEY_ESC:
case KEY_ENT:
case KEY_TAB:
return true; return true;
#endif //MOUSEKEY_ENABLEdf
default: default:
return false; return false;
@ -30,20 +26,6 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
switch (combo_index) { switch (combo_index) {
case KEY_ENT:
if ( get_highest_layer(layer_state) == _SYMBOL ) {
return false;
}
break;
case KEY_ESC:
case KEY_TAB:
if ( get_highest_layer(layer_state) == _NAVIGATION ||
get_highest_layer(layer_state) == _SYMBOL ) {
return false;
}
break;
case MOUSE_BUTTON1: case MOUSE_BUTTON1:
case MOUSE_BUTTON2: case MOUSE_BUTTON2:
case MOUSE_BUTTON3: case MOUSE_BUTTON3:

18
users/t4corun/features/combo.h
View file

@ -12,12 +12,6 @@ enum combos {
MOUSE_DRGTOG, MOUSE_DRGTOG,
#endif //MOUSEKEY_ENABLE #endif //MOUSEKEY_ENABLE
KEY_ESC,
KEY_ENT,
KEY_TAB,
KEY_DEL,
KEY_BSPC,
COMBO_LENGTH COMBO_LENGTH
}; };
@ -34,11 +28,6 @@ const uint16_t PROGMEM mou_btn5_combo[] = { KC_T, KC_G, COMBO_END };
const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_C, COMBO_END }; const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_C, COMBO_END };
#endif //MOUSEKEY_ENABLE #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 };
combo_t key_combos[COMBO_LENGTH] = { combo_t key_combos[COMBO_LENGTH] = {
@ -52,12 +41,5 @@ combo_t key_combos[COMBO_LENGTH] = {
[MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS), [MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS),
#endif //MOUSEKEY_ENABLE #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)
}; };

12
users/t4corun/features/taphold.c
View file

@ -5,15 +5,19 @@ void single_tap(uint16_t key, uint16_t altkey, bool isHold) {
} }
void double_tap(uint16_t key, uint16_t altkey, uint32_t ms) { void double_tap(uint16_t key, uint16_t altkey, uint32_t ms) {
tap_code16(key); bool isShift = ( (get_mods() & MOD_BIT(KC_LSFT)) || (get_oneshot_mods() & MOD_BIT(KC_LSFT)) );
isShift ? tap_code16(LSFT(key)) : tap_code16(key);
wait_ms(ms); wait_ms(ms);
tap_code16(altkey); isShift ? tap_code16(LSFT(altkey)) : tap_code16(altkey);
} }
void insert_brackets(uint16_t left, uint16_t right, uint32_t ms) { void insert_brackets(uint16_t left, uint16_t right, uint32_t ms) {
tap_code16(left); bool isShift = ( (get_mods() & MOD_BIT(KC_LSFT)) || (get_oneshot_mods() & MOD_BIT(KC_LSFT)) );
isShift ? tap_code16(LSFT(left)) : tap_code16(left);
wait_ms(ms); wait_ms(ms);
tap_code16(right); isShift ? tap_code16(LSFT(right)) : tap_code16(right);
wait_ms(ms); wait_ms(ms);
tap_code16(KC_LEFT); tap_code16(KC_LEFT);
} }

3
users/t4corun/features/tapping.c
View file

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

2
users/t4corun/t4corun.c
View file

@ -4,7 +4,7 @@ static uint8_t current_base_layer = _DEFAULT_LAYER_1;
layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
state = update_tri_layer_state(state, _NAVIGATION, _NUMBER, _SYMBOL); state = update_tri_layer_state(state, _NAVIGATION, _SYMBOL, _NUMBER);
return state; return state;
} }

46
users/t4corun/t4corun.h
View file

@ -9,8 +9,8 @@ enum layers {
_COLEMAK_DH, _COLEMAK_DH,
_GAME, _GAME,
_NAVIGATION, _NAVIGATION,
_NUMBER,
_SYMBOL, _SYMBOL,
_NUMBER,
_CONFIG _CONFIG
}; };
@ -48,8 +48,7 @@ enum keycodes {
// momentary layer // momentary layer
#define NAV MO(_NAVIGATION) #define NAV MO(_NAVIGATION)
#define NAV_0 LT(_NAVIGATION, KC_0) #define SYM MO(_SYMBOL)
#define NUM MO(_NUMBER)
#define CONFIG MO(_CONFIG) #define CONFIG MO(_CONFIG)
// Windows Shortcuts // Windows Shortcuts
@ -185,9 +184,8 @@ enum keycodes {
#define _SCAG_MODS________________________ TR_LSFT, TR_LCTL, TR_LALT, TR_LGUI #define _SCAG_MODS________________________ TR_LSFT, TR_LCTL, TR_LALT, TR_LGUI
#define _UCCPR_L___________________________________ SC_UNDO, SC_CUT, SC_COPY, SC_PAST, SC_REDO #define _UCCPR_L___________________________________ SC_UNDO, SC_CUT, SC_COPY, SC_PAST, SC_REDO
#define _BASE_L4_________________ ___x___, NUM, TR_LSFT #define _BASE_L4_________________ ___x___, SYM, TR_LSFT
#define _BASE_R4_________________ KC_SPC, NAV, KC_MUTE #define _BASE_R4_________________ KC_SPC, NAV, KC_MUTE
#define _BASE_ZERO_R4____________ KC_SPC, NAV_0, KC_MUTE
#define _LAYER_TRANS_____________ ___x___, _______, ___x___ #define _LAYER_TRANS_____________ ___x___, _______, ___x___
@ -211,35 +209,35 @@ enum keycodes {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, KC_8, KC_9, KC_ESC, \ 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_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_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_1, KC_2, KC_3, CM_TOGG, \
KC_ENT, KC_SPC, KC_LSFT, _BASE_ZERO_R4____________ KC_ENT, KC_SPC, KC_LSFT, _BASE_R4_________________
#define LAYER_NAVIGATION \ #define LAYER_NAVIGATION \
___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, ___x___, ___x___, TR_SNIP, TR_SDPI, TR_PDPI, \ ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_CAPS, KC_TAB, ___x___, KC_PSCR, CONFIG, \
___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ___x___, _SCAG_MODS________________________, \ ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \
_UCCPR_L___________________________________, ___x___, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ _UCCPR_L___________________________________, KC_DEL, KC_APP, TR_SNIP, TR_SDPI, TR_PDPI, \
ZOOMRST, _______, KC_SPC, _LAYER_TRANS_____________ ZOOMRST, SYM, KC_ENT, _LAYER_TRANS_____________
#define LAYER_NUMBER \
CONFIG, 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____________
#define LAYER_SYMBOL \ #define LAYER_SYMBOL \
KC_CAPS, KC_PSCR, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \ KC_ESC, KC_AMPR, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, TR_LABK, KC_RABK, TR_DQUO, \
KC_AMPR, TR_LCBR, KC_RCBR, TR_PIPE, TR_SCLN, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \ _SCAG_MODS________________________, TR_SCLN, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \
TR_PERC, TR_LABK, KC_RABK, KC_BSLS, TR_EXLM, ___x___, KC_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \ TR_PERC, TR_PIPE, KC_ASTR, KC_BSLS, TR_EXLM, ___x___, KC_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \
_LAYER_TRANS_____________, _BASE_R4_________________
#define LAYER_NUMBER \
KC_7, KC_5, KC_3, KC_1, KC_9, KC_8, KC_0, KC_2, KC_4, KC_6, \
_GACS_MODS________________________, KC_F11, KC_F12, ___x___, KC_VOLD, KC_VOLU, KC_MUTE, \
KC_F7, KC_F5, KC_F3, KC_F1, KC_F9, KC_F8, KC_F10, KC_F2, KC_F4, KC_F6, \
_LAYER_TRANS_____________, _LAYER_TRANS_____________ _LAYER_TRANS_____________, _LAYER_TRANS_____________
#define LAYER_CONFIG \ #define LAYER_CONFIG \
_______, ___x___, ___x___, ___x___, ___x___, ___x___, KC_F7, KC_F8, KC_F9, KC_F10, \ _NONE_5____________________________________, ___x___, ___x___, EE_CLR, QK_BOOT, _______, \
___x___, ___x___, ___x___, TR_LSFT, ___x___, ___x___, KC_F4, KC_F5, KC_F6, KC_F11, \ _NONE_5____________________________________, ___x___, TR_LSFT, ___x___, ___x___, TR_RMOD, \
TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, ___x___, KC_F1, KC_F2, KC_F3, KC_F12, \ _NONE_5____________________________________, TR_RTOG, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, \
TR_RTOG, EE_CLR, QK_BOOT, TR_DMP1, TR_DMR1, BASELYR BASELYR, ___x___, ___x___, TR_DMP1, TR_DMR1, TR_RTOG
/* /*
If I was going to combine number and symbols together, it'd look like this If I was going to combine number and symbols together, it'd look like this