From fb3b51bacd51312fc7561aa6860eab3500fd8943 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 17 Apr 2024 23:41:56 -0500 Subject: [PATCH] Combined mouse and function layer --- .../barbellboards/rollow/keymaps/t4corun/keymap.c | 2 -- .../charybdis/3x5/keymaps/t4corun/keymap.c | 1 - keyboards/bluebell/swoop/keymaps/t4corun/keymap.c | 2 -- keyboards/crkbd/keymaps/t4corun/keymap.c | 1 - keyboards/planck/keymaps/t4corun/keymap.c | 1 - users/t4corun/features/combo.h | 8 ++++---- users/t4corun/features/oled.c | 5 ----- users/t4corun/features/oled.h | 4 ---- users/t4corun/t4corun.h | 15 ++++----------- 9 files changed, 8 insertions(+), 31 deletions(-) diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c index d45a7ad4..2b9473fc 100644 --- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c +++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c @@ -26,7 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMBER] = ROLLOW(LAYER_NUMBER), [_SYMBOL] = ROLLOW(LAYER_SYMBOL), [_FUNCTION] = ROLLOW(LAYER_FUNCTION), - [_MOUSE] = ROLLOW(LAYER_MOUSE), [_CONFIG] = ROLLOW(LAYER_CONFIG) }; @@ -43,7 +42,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_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___) }, [_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 0ab681a5..2345a290 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c @@ -26,7 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMBER] = CNANO(LAYER_NUMBER), [_SYMBOL] = CNANO(LAYER_SYMBOL), [_FUNCTION] = CNANO(LAYER_FUNCTION), - [_MOUSE] = CNANO(LAYER_MOUSE), [_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 1a089d23..f5f000b4 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -26,7 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMBER] = SWOOP(LAYER_NUMBER), [_SYMBOL] = SWOOP(LAYER_SYMBOL), [_FUNCTION] = SWOOP(LAYER_FUNCTION), - [_MOUSE] = SWOOP(LAYER_MOUSE), [_CONFIG] = SWOOP(LAYER_CONFIG) }; @@ -44,7 +43,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_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___) }, [_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 e5a4aa33..0e961767 100644 --- a/keyboards/crkbd/keymaps/t4corun/keymap.c +++ b/keyboards/crkbd/keymaps/t4corun/keymap.c @@ -26,7 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMBER] = CRKBD(LAYER_NUMBER), [_SYMBOL] = CRKBD(LAYER_SYMBOL), [_FUNCTION] = CRKBD(LAYER_FUNCTION), - [_MOUSE] = CRKBD(LAYER_MOUSE), [_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 2fb1fae8..00d8c44b 100644 --- a/keyboards/planck/keymaps/t4corun/keymap.c +++ b/keyboards/planck/keymaps/t4corun/keymap.c @@ -26,7 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUMBER] = PLANCK(LAYER_NUMBER), [_SYMBOL] = PLANCK(LAYER_SYMBOL), [_FUNCTION] = PLANCK(LAYER_FUNCTION), - [_MOUSE] = PLANCK(LAYER_MOUSE), [_CONFIG] = PLANCK(LAYER_CONFIG) }; \ No newline at end of file diff --git a/users/t4corun/features/combo.h b/users/t4corun/features/combo.h index de60ff61..e2f5ed81 100644 --- a/users/t4corun/features/combo.h +++ b/users/t4corun/features/combo.h @@ -38,13 +38,13 @@ 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_tab_combo[] = { KC_C, KC_V, COMBO_END }; -const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END }; +const uint16_t PROGMEM key_tab_combo[] = { KC_C, KC_V, COMBO_END }; +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_del_combo[] = { TR_COMM, 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 key_bwrd_combo[] = { KC_M, TR_DOT, COMBO_END }; const uint16_t PROGMEM lyr_cfg_combo[] = { KC_SPC, NAV, COMBO_END }; diff --git a/users/t4corun/features/oled.c b/users/t4corun/features/oled.c index e1b8fe24..5b0ec8f2 100644 --- a/users/t4corun/features/oled.c +++ b/users/t4corun/features/oled.c @@ -37,11 +37,6 @@ void render_layer_state(void) { oled_write_P(PSTR(OLED_RENDER_LAYER_NAVIGATION), get_highest_layer(layer_state) == _NAVIGATION); oled_write_P(PSTR(OLED_RENDER_LAYER_NUMBER), get_highest_layer(layer_state) == _NUMBER); oled_write_P(PSTR(OLED_RENDER_LAYER_SYMBOL), get_highest_layer(layer_state) == _SYMBOL); - -#if defined(MOUSEKEY_ENABLE) - oled_write_P(PSTR(OLED_RENDER_LAYER_MOUSE), get_highest_layer(layer_state) == _MOUSE); -#endif //MOUSEKEY_ENABLE - 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 273b971f..96688394 100644 --- a/users/t4corun/features/oled.h +++ b/users/t4corun/features/oled.h @@ -19,10 +19,6 @@ #define OLED_RENDER_LAYER_FUNCTION " Fun " #define OLED_RENDER_LAYER_CONFIG " Cfg " -#if defined(MOUSEKEY_ENABLE) -# define OLED_RENDER_LAYER_MOUSE " Mou " -#endif //MOUSEKEY_ENABLE - void render_crkbd_logo(void); void render_default_layer_state(void); void render_layer_state(void); diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index 70bfcce0..ed2e7f62 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -225,7 +225,7 @@ enum keycodes { #define LAYER_NAVIGATION \ - KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, ___x___, ___x___, ___x___, ___x___, \ + KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, KC_CAPS, KC_SCRL, ___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, _______, KC_ENT, _LAYER_TRANS_____________ @@ -246,19 +246,12 @@ enum keycodes { #define LAYER_FUNCTION \ - TR_DMP2, TR_DMR2, ___x___, ___x___, KC_SCRL, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, \ - ___x___, ___x___, ___x___, ___x___, KC_NUM, KC_CAPS, KC_F4, KC_F5, KC_F6, KC_F11, \ - _NONE_5____________________________________, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F12, \ + ___x___, ___x___, TR_MOUU, ___x___, TR_MWHU, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, \ + ___x___, TR_MOUL, TR_MOUD, TR_MOUR, TR_MWHD, KC_NUM, KC_F4, KC_F5, KC_F6, KC_F11, \ + TR_PDPI, TR_SDPI, ___x___, TR_DRGS, TR_SNIP, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F12, \ _LAYER_TRANS_____________, TR_DMP1, TR_DMR1, ___x___ -#define LAYER_MOUSE \ - ___x___, TR_BTN5, TR_BTN4, TR_BTN3, ___x___, TR_MWHU, ___x___, TR_MOUU, ___x___, ___x___, \ - _______, _GACS_MOUSE_MODS_________, ___x___, TR_MWHD, TR_MOUL, TR_MOUD, TR_MOUR, ___x___, \ - _NONE_3__________________, TR_DRGS, TR_SNIP, TR_SDPI, TR_PDPI, ___x___, ___x___, ___x___, \ - ___x___, TR_BTN1, TR_BTN2, _NONE_3__________________ - - #define LAYER_CONFIG \ _NONE_5____________________________________, EE_CLR, QK_RBT, QK_BOOT, ___x___, ___x___, \ TR_RTOG, TR_RMOD, _NONE_3__________________, BASELYR, _SCAG_MODS________________________, \