Updating wrappers

- Changed wrapper to 3x5_3 layout so I can customize a key for each
layer versus specifing one key for all layers
- Tried to be thoughtful on what I need
This commit is contained in:
Victor 2024-04-11 23:30:46 -05:00
parent 1f37e8281c
commit 72d86e4c52
Failed to generate hash of commit
7 changed files with 43 additions and 38 deletions

View file

@ -0,0 +1 @@
#pragma once

View file

@ -2,20 +2,20 @@
#define LAYOUT_rollow_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
#define LAYOUT_3x5_keymap( \
#define LAYOUT_3x5_3_keymap( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k33, k34, k35, k36 \
k32, k33, k34, k35, k36, k37 \
) \
LAYOUT_rollow_wrapper ( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
KC_NO, k33, k34, k35, k36, KC_NO \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k32, k33, k34, k35, k36, K37 \
)
#define ROLLOW(...) LAYOUT_3x5_keymap(__VA_ARGS__)
#define ROLLOW(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@ -40,7 +40,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, vol up and down
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, vol up and down
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, //wheel up, wheel down, xx,xx
[_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, //xx,xx left and right
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx
[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, //xx,xx up and down

View file

@ -2,11 +2,11 @@
#define LAYOUT_cnano_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
#define LAYOUT_3x5_keymap( \
#define LAYOUT_3x5_3_keymap( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k33, k34, k35, k36 \
k32, k33, k34, k35, k36, k37 \
) \
LAYOUT_cnano_wrapper ( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
@ -15,7 +15,7 @@ LAYOUT_cnano_wrapper ( \
TR_BTN1, k33, k34, k35, k36 \
)
#define CNANO(...) LAYOUT_3x5_keymap(__VA_ARGS__)
#define CNANO(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

View file

@ -2,20 +2,20 @@
#define LAYOUT_swoop_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__)
#define LAYOUT_3x5_keymap( \
#define LAYOUT_3x5_3_keymap( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k33, k34, k35, k36 \
k32, k33, k34, k35, k36, k37 \
) \
LAYOUT_swoop_wrapper ( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
KC_NO, k33, k34, k35, k36, KC_NO \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k32, k33, k34, k35, k36, K37 \
)
#define SWOOP(...) LAYOUT_3x5_keymap(__VA_ARGS__)
#define SWOOP(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

View file

@ -2,11 +2,11 @@
#define LAYOUT_crkbd_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
#define LAYOUT_3x5_keymap( \
#define LAYOUT_3x5_3_keymap( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k33, k34, k35, k36 \
k32, k33, k34, k35, k36, k37 \
) \
LAYOUT_crkbd_wrapper ( \
KC_NO, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, \
@ -15,7 +15,7 @@ LAYOUT_crkbd_wrapper ( \
TR_BTN1, k33, k34, k35, k36, TR_BTN4 \
)
#define CRKBD(...) LAYOUT_3x5_keymap(__VA_ARGS__)
#define CRKBD(...) LAYOUT_3x5_3_keymap(__VA_ARGS__)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

View file

@ -6,13 +6,13 @@
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k33, k34, k35, k36 \
k32, k33, k34, k35, k36, k37 \
) \
LAYOUT_planck_wrapper ( \
k00, k01, k02, k03, k04, KC_NO, KC_NO, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, KC_NO, KC_NO, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, KC_NO, KC_NO, k25, k26, k27, k28, k29, \
KC_NO, KC_NO, KC_NO, KC_NO, k33, k34, k35, k36, KC_NO, KC_NO, KC_NO, KC_ESC \
k00, k01, k02, k03, k04, KC_NO, KC_NO, k05, k06, k07, k08, k09, \
k10, k11, k12, k13, k14, KC_NO, KC_NO, k15, k16, k17, k18, k19, \
k20, k21, k22, k23, k24, KC_NO, KC_NO, k25, k26, k27, k28, k29, \
KC_NO, KC_NO, KC_NO, k32, k33, k34, k35, k36, k37, KC_NO, KC_NO, KC_ESC \
)
#define PLANCK(...) LAYOUT_3x5_keymap(__VA_ARGS__)

View file

@ -59,10 +59,14 @@ enum keycodes {
#define SC_FILE LGUI(KC_E)
// Visual Studio Code
#define VS_FOLD LCTL(LSFT(KC_7))
#define VS_UFLD LCTL(LSFT(KC_9))
// Zoom
#define ZOOMIN LCTL(LSFT(KC_EQL))
#define ZOOMOUT LCTL(KC_MINS)
#define ZOOMRST LCTL(KC_0)
/*
- Any keycodes with prefix TR has behavior dependent on if the feature is enabled.
- If the feature is disabled then the key is just the normal key
@ -208,74 +212,74 @@ enum keycodes {
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_ESC, KC_LSFT, KC_SPC, KC_ENT
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, \
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TR_COMM, TR_DOT, TR_MINS, \
_BASE_L4________, _BASE_R4________
TR_BTN1, _BASE_L4________, _BASE_R4________, KC_MUTE
#define LAYER_COLEMAK_DH \
KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, TR_QUOT, \
TR_MOUA, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \
KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, TR_COMM, TR_DOT, TR_MINS, \
_BASE_L4________, _BASE_R4________
TR_BTN1, _BASE_L4________, _BASE_R4________, KC_MUTE
#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_LSFT, KC_SPC, _BASE_R4________
___x___, KC_LSFT, KC_SPC, _BASE_R4________, KC_MUTE
#define LAYER_NAVIGATION \
KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, VS_FOLD, KC_APP, VS_UFLD, CONFIG, \
___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \
_UCCPR_L___________________________________, KC_DEL, KC_TAB, KC_VOLD, KC_VOLU, KC_MUTE, \
_______, KC_ENT, _LAYER_TRANS_R__
ZOOMRST, _______, KC_ENT, _LAYER_TRANS_R__, ___x___
#define LAYER_NUMBER \
KC_ESC, SC_SNIP, SC_FILE, FUNC, 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, \
_LAYER_TRANS_L__, _BASE_R4________
___x___, _LAYER_TRANS_L__, _BASE_R4________, ___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, \
_LAYER_TRANS_L__, _LAYER_TRANS_R__
___x___, _LAYER_TRANS_L__, _LAYER_TRANS_R__, ___x___
#define LAYER_FUNCTION \
TR_DMP2, TR_DMR2, ___x___, _______, ___x___, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, \
___x___, ___x___, ___x___, ___x___, KC_SCRL, KC_CAPS, KC_F4, KC_F5, KC_F6, KC_F11, \
_NONE_5____________________________________, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F12, \
_LAYER_TRANS_L__, TR_DMP1, TR_DMR1
___x___, _LAYER_TRANS_L__, 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___, \
___x___, ___x___, ___x___, TR_DRGS, TR_SNIP, TR_SDPI, TR_PDPI, ___x___, ___x___, ___x___, \
TR_BTN1, TR_BTN2, ___x___, ___x___
TR_BTN1, TR_BTN1, TR_BTN2, ___x___, ___x___, ___x___
#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____________________________________, \
KC_LALT, KC_LCTL, _LAYER_TRANS_R__
___x___, KC_LALT, KC_LCTL, _LAYER_TRANS_R__, KC_MUTE
#define LAYER_CONFIG \
___x___, ___x___, ___x___, ___x___, ___x___, EE_CLR, QK_RBT, QK_BOOT, ___x___, _______, \
TR_RTOG, TR_RMOD, ___x___, ___x___, ___x___, BASELYR, _SCAG_MODS________________________, \
TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, _NONE_5____________________________________, \
___x___, ___x___, _LAYER_TRANS_R__
___x___, ___x___, ___x___, _LAYER_TRANS_R__, ___x___