diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c index d75794be..d45a7ad4 100644 --- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c +++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c @@ -27,7 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SYMBOL] = ROLLOW(LAYER_SYMBOL), [_FUNCTION] = ROLLOW(LAYER_FUNCTION), [_MOUSE] = ROLLOW(LAYER_MOUSE), - [_GAME_NUM] = ROLLOW(LAYER_GAME_NUM), [_CONFIG] = ROLLOW(LAYER_CONFIG) }; @@ -45,7 +44,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, [_MOUSE] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, - [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, }; diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c index 6dff9187..0ab681a5 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c @@ -27,7 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SYMBOL] = CNANO(LAYER_SYMBOL), [_FUNCTION] = CNANO(LAYER_FUNCTION), [_MOUSE] = CNANO(LAYER_MOUSE), - [_GAME_NUM] = CNANO(LAYER_GAME_NUM), [_CONFIG] = CNANO(LAYER_CONFIG) }; \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c index 92efb33e..1a089d23 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -27,7 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SYMBOL] = SWOOP(LAYER_SYMBOL), [_FUNCTION] = SWOOP(LAYER_FUNCTION), [_MOUSE] = SWOOP(LAYER_MOUSE), - [_GAME_NUM] = SWOOP(LAYER_GAME_NUM), [_CONFIG] = SWOOP(LAYER_CONFIG) }; @@ -46,7 +45,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, [_MOUSE] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, - [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, }; diff --git a/keyboards/crkbd/keymaps/t4corun/keymap.c b/keyboards/crkbd/keymaps/t4corun/keymap.c index 3114f27a..e5a4aa33 100644 --- a/keyboards/crkbd/keymaps/t4corun/keymap.c +++ b/keyboards/crkbd/keymaps/t4corun/keymap.c @@ -27,7 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SYMBOL] = CRKBD(LAYER_SYMBOL), [_FUNCTION] = CRKBD(LAYER_FUNCTION), [_MOUSE] = CRKBD(LAYER_MOUSE), - [_GAME_NUM] = CRKBD(LAYER_GAME_NUM), [_CONFIG] = CRKBD(LAYER_CONFIG) }; \ No newline at end of file diff --git a/keyboards/planck/keymaps/t4corun/keymap.c b/keyboards/planck/keymaps/t4corun/keymap.c index 3cec3d89..2fb1fae8 100644 --- a/keyboards/planck/keymaps/t4corun/keymap.c +++ b/keyboards/planck/keymaps/t4corun/keymap.c @@ -27,7 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_SYMBOL] = PLANCK(LAYER_SYMBOL), [_FUNCTION] = PLANCK(LAYER_FUNCTION), [_MOUSE] = PLANCK(LAYER_MOUSE), - [_GAME_NUM] = PLANCK(LAYER_GAME_NUM), [_CONFIG] = PLANCK(LAYER_CONFIG) }; \ No newline at end of file diff --git a/users/t4corun/config/combo_config.h b/users/t4corun/config/combo_config.h index 87182471..b154e1d5 100644 --- a/users/t4corun/config/combo_config.h +++ b/users/t4corun/config/combo_config.h @@ -23,7 +23,7 @@ Explore these (there are way more) //Set common configuration for all keyboards -#define COMBO_TERM 50 +#define COMBO_TERM 25 #define COMBO_TERM_PER_COMBO #define COMBO_MUST_TAP_PER_COMBO #define EXTRA_SHORT_COMBOS diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c index 9cf3eb26..94908766 100644 --- a/users/t4corun/features/combo.c +++ b/users/t4corun/features/combo.c @@ -16,20 +16,14 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) { switch (index) { -#if defined(MOUSEKEY_ENABLE222) - case MOUSE_BUTTON1: - case MOUSE_BUTTON2: - case MOUSE_BUTTON3: - case MOUSE_BUTTON4: - case MOUSE_BUTTON5: +#if defined(MOUSEKEY_ENABLE) case MOUSE_DRGTOG: #endif //MOUSEKEY_ENABLE case KEY_ESC: case KEY_TAB: case KEY_ENT: - case KEY_DEL: - case KEY_BSPC: + case KEY_BWRD: return true; default: diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h index 363ee1bf..98894d9e 100644 --- a/users/t4corun/features/combo.h +++ b/users/t4corun/features/combo.h @@ -21,6 +21,7 @@ enum combos { // right hand combos KEY_DEL, KEY_BSPC, + KEY_BWRD, LYR_CONFIG, COMBO_LENGTH @@ -30,11 +31,11 @@ enum combos { // left hand combos #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_S, KC_F, COMBO_END }; +const uint16_t PROGMEM mou_btn2_combo[] = { KC_S, KC_F, COMBO_END }; +const uint16_t PROGMEM mou_btn3_combo[] = { KC_S, KC_D, COMBO_END }; const uint16_t PROGMEM mou_btn4_combo[] = { KC_E, KC_R, COMBO_END }; -const uint16_t PROGMEM mou_btn5_combo[] = { KC_W, KC_E, COMBO_END }; -const uint16_t PROGMEM mou_drg_combo[] = { KC_Z, KC_X, COMBO_END }; +const uint16_t PROGMEM mou_btn5_combo[] = { KC_W, KC_R, COMBO_END }; +const uint16_t PROGMEM mou_drg_combo[] = { TR_MOUA, KC_S, COMBO_END }; #endif //MOUSEKEY_ENABLE const uint16_t PROGMEM key_esc_combo[] = { KC_Q, KC_W, COMBO_END }; @@ -45,6 +46,7 @@ const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END }; // right hand combos const uint16_t PROGMEM key_del_combo[] = { KC_M, TR_DOT, COMBO_END }; const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END }; +const uint16_t PROGMEM key_bwrd_combo[] = { TR_COMM, TR_DOT, COMBO_END }; const uint16_t PROGMEM lyr_cfg_combo[] = { KC_SPC, NAV, COMBO_END }; @@ -68,6 +70,7 @@ combo_t key_combos[COMBO_LENGTH] = { // right hand combos [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/features/oled.c b/users/t4corun/features/oled.c index c7282a3c..e1b8fe24 100644 --- a/users/t4corun/features/oled.c +++ b/users/t4corun/features/oled.c @@ -42,7 +42,7 @@ void render_layer_state(void) { oled_write_P(PSTR(OLED_RENDER_LAYER_MOUSE), get_highest_layer(layer_state) == _MOUSE); #endif //MOUSEKEY_ENABLE - oled_write_P(PSTR(OLED_RENDER_LAYER_GAME_NUM), get_highest_layer(layer_state) == _GAME_NUM); + oled_write_P(PSTR(OLED_RENDER_LAYER_FUNCTION), get_highest_layer(layer_state) == _FUNCTION); oled_write_P(PSTR(OLED_RENDER_LAYER_CONFIG), get_highest_layer(layer_state) == _CONFIG); } diff --git a/users/t4corun/features/oled.h b/users/t4corun/features/oled.h index fad58170..273b971f 100644 --- a/users/t4corun/features/oled.h +++ b/users/t4corun/features/oled.h @@ -7,7 +7,7 @@ #define OLED_RENDER_MODS_NAME "Mods:" #define OLED_RENDER_LAYOUT_NAME "Lyout" -#define OLED_RENDER_LAYOUT_QWERTY " QRTY" +#define OLED_RENDER_LAYOUT_QWERTY " qrty" #define OLED_RENDER_LAYOUT_COLEMAK_DH " cmDH" #define OLED_RENDER_LAYOUT_GAME " Game" @@ -16,7 +16,7 @@ #define OLED_RENDER_LAYER_NUMBER " Num " #define OLED_RENDER_LAYER_NAVIGATION " Nav " #define OLED_RENDER_LAYER_SYMBOL " Sym " -#define OLED_RENDER_LAYER_GAME_NUM " gNum" +#define OLED_RENDER_LAYER_FUNCTION " Fun " #define OLED_RENDER_LAYER_CONFIG " Cfg " #if defined(MOUSEKEY_ENABLE) diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index a8cc2ad9..dfcdd12c 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -48,7 +48,6 @@ enum keycodes { #define NUM MO(_NUMBER) #define CONFIG MO(_CONFIG) #define FUNC MO(_FUNCTION) -#define GAMENUM MO(_GAME_NUM) // Windows Shortcuts #define SC_COPY LCTL(KC_C) @@ -204,13 +203,6 @@ enum keycodes { //___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, -#define BASETEST \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ - KC_TAB, KC_ESC, KC_LSFT, KC_SPC, KC_ENT, KC_MUTE - - #define LAYER_QWERTY \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ TR_MOUA, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TR_QUOT, \ @@ -226,30 +218,30 @@ enum keycodes { #define LAYER_GAME \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, _NONE_5____________________________________, \ - GAMENUM, KC_A, KC_S, KC_D, KC_F, _NONE_5____________________________________, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, _NONE_5____________________________________, \ + 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, \ ___x___, KC_LSFT, KC_SPC, _BASE_R4_________________ #define LAYER_NAVIGATION \ - KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, ___x___, ___x___, ___x___, CONFIG, \ - KC_TAB, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \ - _UCCPR_L___________________________________, KC_DEL, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ - ZOOMRST, _______, KC_ENT, _LAYER_TRANS_____________ + ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, ___x___, ___x___, ___x___, ___x___, \ + ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ___x___, _SCAG_MODS________________________, \ + _UCCPR_L___________________________________, ___x___, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ + ZOOMRST, _______, ___x___, _LAYER_TRANS_____________ #define LAYER_NUMBER \ - KC_ESC, SC_SNIP, SC_FILE, ___x___, TR_GRV, KC_ENT, KC_7, KC_8, KC_9, KC_TAB, \ - _GACS_MODS________________________, TR_SCLN, KC_BSPC, KC_4, KC_5, KC_6, KC_DOT, \ - _UCCPR_L___________________________________, KC_DEL, KC_1, KC_2, KC_3, TR_MINS, \ + ___x___, SC_SNIP, SC_FILE, ___x___, TR_GRV, ___x___, KC_7, KC_8, KC_9, ___x___, \ + _GACS_MODS________________________, TR_SCLN, ___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, ___x___ #define LAYER_SYMBOL \ - KC_ESC, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \ - KC_AMPR, TR_LCBR, KC_RCBR, KC_PIPE, TR_SCLN, KC_BSPC, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \ - TR_PERC, TR_LABK, KC_RABK, KC_BSLS, KC_EXLM, KC_DEL, KC_SLSH, TR_LPRN, TR_DOT, TR_MINS, \ + ___x___, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \ + KC_AMPR, TR_LCBR, KC_RCBR, KC_PIPE, TR_SCLN, ___x___, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \ + TR_PERC, TR_LABK, KC_RABK, KC_BSLS, KC_EXLM, ___x___, KC_SLSH, TR_LPRN, TR_DOT, TR_MINS, \ _LAYER_TRANS_____________, _LAYER_TRANS_____________ @@ -267,13 +259,6 @@ enum keycodes { ___x___, TR_BTN1, TR_BTN2, _NONE_3__________________ -#define LAYER_GAME_NUM \ - ___x___, KC_ESC, KC_TILD, KC_G, KC_T, _NONE_5____________________________________, \ - _______, KC_1, KC_2, KC_3, KC_4, _NONE_5____________________________________, \ - ___x___, KC_5, KC_6, KC_7, KC_8, _NONE_5____________________________________, \ - ___x___, KC_LALT, KC_LCTL, _LAYER_TRANS_____________ - - #define LAYER_CONFIG \ _NONE_5____________________________________, EE_CLR, QK_RBT, QK_BOOT, ___x___, ___x___, \ TR_RTOG, TR_RMOD, _NONE_3__________________, BASELYR, _SCAG_MODS________________________, \