Skip to content

Commit

Permalink
kyria: remove LAYOUT_stack (qmk#21384)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fauxpark @thismarvin
fauxpark authored and thismarvin committed Sep 27, 2023
1 parent f3ef436 commit 3f6c2a0
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 275 deletions.
120 changes: 40 additions & 80 deletions keyboards/splitkb/kyria/keymaps/rmw/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,100 +18,60 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[QWERTY] = LAYOUT_stack(
KC_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T,
OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G,
TD(FRBK2) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE,
TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC),

KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MS_BTN1,
SFTENT, KC_SPC, TD(GCA), TD(CTLALL), KC_CAPS
[QWERTY] = LAYOUT_split_3x6_5(
KC_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G, KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
TD(FRBK2) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE, KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MS_BTN1,
TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC), SFTENT, KC_SPC, TD(GCA), TD(CTLALL), KC_CAPS
),

[MINIMAK4] = LAYOUT_stack(
KC_TAB , KC_Q, KC_W, KC_D, KC_R, KC_K,
OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G,
OSM(MOD_LSFT) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE,
_______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC),

KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MINS,
SFTENT, KC_SPC, TD(GCA), TD(CTLALL), _______
[MINIMAK4] = LAYOUT_split_3x6_5(
KC_TAB , KC_Q, KC_W, KC_D, KC_R, KC_K, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G, KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
OSM(MOD_LSFT) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE, KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MINS,
_______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC), SFTENT, KC_SPC, TD(GCA), TD(CTLALL), _______
),

[NUMPAD] = LAYOUT_stack(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, TO(QWERTY), _______,
_______, _______, _______, _______ , _______,

_______, KC_7, KC_8, KC_9, KC_KP_MINUS, _______,
_______, KC_4, KC_5, KC_6, KC_KP_PLUS , _______,
_______, TO(EDIT), _______, KC_1, KC_2, KC_3, KC_KP_SLASH, LCTL(KC_RIGHT),
_______, _______, KC_0, KC_DOT, _______
[NUMPAD] = LAYOUT_split_3x6_5(
_______, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_KP_MINUS, _______,
_______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, KC_KP_PLUS , _______,
_______, _______, _______, _______, _______, _______, TO(QWERTY), _______, _______, TO(EDIT), _______, KC_1, KC_2, KC_3, KC_KP_SLASH, LCTL(KC_RIGHT),
_______, _______, _______, _______ , _______, _______, _______, KC_0, KC_DOT, _______
),

[EDIT] = LAYOUT_stack(
_______, TASK_MAN, _______, SELW_LEFT, SELW_RIGHT, _______,
_______, _______ , LGUI(KC_GRV), MVW_LEFT, MVW_RIGHT , _______,
LCTL(KC_LEFT), R_UNDO, R_CUT , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET,
_______, _______, _______, DEL_WRD, _______,

NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
R_HOME , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
_______, _______, _______, _______, _______
[EDIT] = LAYOUT_split_3x6_5(
_______, TASK_MAN, _______, SELW_LEFT, SELW_RIGHT, _______, NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
_______, _______ , LGUI(KC_GRV), MVW_LEFT, MVW_RIGHT , _______, R_HOME , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
LCTL(KC_LEFT), R_UNDO, R_CUT , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET, FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
_______, _______, _______, DEL_WRD, _______, _______, _______, _______, _______, _______
),

[ADJUST] = LAYOUT_stack(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
TO(QWERTY), TO(EDIT), TO(NUMPAD), TO(JSYM), TO(FSYM), TO(MEDIA),
DF(MINIMAK4), DF(QWERTY), RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______,
_______, _______, _______, _______, _______,

KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______
[ADJUST] = LAYOUT_split_3x6_5(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
TO(QWERTY), TO(EDIT), TO(NUMPAD), TO(JSYM), TO(FSYM), TO(MEDIA), _______, _______, _______, _______, _______, _______,
DF(MINIMAK4), DF(QWERTY), RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[FSYM] = LAYOUT_stack(
_______, _______, _______, _______, _______, _______,
_______, _______, KC_TILD, KC_EXLM, _______, _______,
LCTL(KC_RIGHT), _______, TO(QWERTY), _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______,

KC_CIRC, KC_AMPR , KC_ASTR, KC_GRV , _______, _______,
KC_EQUAL, KC_MINUS, KC_UNDS, KC_PIPE, KC_COLON, KC_DQT,
_______, _______, _______, KC_PLUS, KC_BSLS, KC_SLSH, _______, _______,
_______, _______, _______, _______, _______
[FSYM] = LAYOUT_split_3x6_5(
_______, _______, _______, _______, _______, _______, KC_CIRC, KC_AMPR , KC_ASTR, KC_GRV , _______, _______,
_______, _______, KC_TILD, KC_EXLM, _______, _______, KC_EQUAL, KC_MINUS, KC_UNDS, KC_PIPE, KC_COLON, KC_DQT,
LCTL(KC_RIGHT), _______, TO(QWERTY), _______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_BSLS, KC_SLSH, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[JSYM] = LAYOUT_stack(
_______, KC_GRV, KC_AT , KC_LCBR, KC_RCBR, _______,
_______, KC_HASH, KC_DLR , KC_LPRN, KC_RPRN, KC_LEFT,
_______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______,
_______, _______, _______, _______, _______,

_______, _______, _______, _______, _______, _______,
_______, _______, KC_QUES, KC_SLSH, KC_COLON, _______,
_______, _______, _______, _______, _______, TO(QWERTY), _______, LCTL(KC_LEFT),
_______, _______, _______, _______, _______
[JSYM] = LAYOUT_split_3x6_5(
_______, KC_GRV, KC_AT , KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, _______,
_______, KC_HASH, KC_DLR , KC_LPRN, KC_RPRN, KC_LEFT, _______, _______, KC_QUES, KC_SLSH, KC_COLON, _______,
_______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, _______, TO(QWERTY), _______, LCTL(KC_LEFT),
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[MEDIA] = LAYOUT_stack(
_______, KC_WH_U, KC_WH_L, KC_MS_UP, KC_WH_R, _______,
_______, KC_WH_D, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______,
_______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______,
_______, _______, _______, _______, _______,

_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______,
KC_MS_BTN1, KC_MEDIA_PLAY_PAUSE, KC_MRWD, KC_MFFD, _______
[MEDIA] = LAYOUT_split_3x6_5(
_______, KC_WH_U, KC_WH_L, KC_MS_UP, KC_WH_R, _______, _______, _______, _______, _______, _______, _______,
_______, KC_WH_D, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______,
_______, _______, _______, _______, _______, KC_MS_BTN1, KC_MEDIA_PLAY_PAUSE, KC_MRWD, KC_MFFD, _______
)
};

Expand Down
15 changes: 5 additions & 10 deletions keyboards/splitkb/kyria/keymaps/uqs/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,11 @@
R45, R46, R47, \
R32, R33 \
) \
LAYOUT_stack( \
L00, L01, L02, L03, L04, L05, \
L12, L13, L14, L15, L16, L17, \
L24, L25, L26, L27, L28, L29, L30, L31, \
L40, L41, L42, L43, L44, \
\
R06, R07, R08, R09, R10, R11, \
R18, R19, R20, R21, R22, R23, \
R32, R33, R34, R35, R36, R37, R38, R39, \
R45, R46, R47, R48, R49 \
LAYOUT_split_3x6_5( \
L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
)

// clang-format off
Expand Down
61 changes: 0 additions & 61 deletions keyboards/splitkb/kyria/rev1/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,67 +94,6 @@
{"matrix": [7, 3], "x": 12, "y": 3.25},
{"matrix": [7, 4], "x": 13, "y": 3.25}
]
},
"LAYOUT_stack": {
"layout": [
{"matrix": [0, 7], "x": 0, "y": 0},
{"matrix": [0, 6], "x": 1, "y": 0},
{"matrix": [0, 5], "x": 2, "y": 0},
{"matrix": [0, 4], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},

{"matrix": [1, 7], "x": 6, "y": 0},
{"matrix": [1, 6], "x": 7, "y": 0},
{"matrix": [1, 5], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 3], "x": 10, "y": 0},
{"matrix": [1, 2], "x": 11, "y": 0},

{"matrix": [2, 7], "x": 12, "y": 0},
{"matrix": [2, 6], "x": 13, "y": 0},
{"matrix": [2, 5], "x": 14, "y": 0},
{"matrix": [2, 4], "x": 15, "y": 0},
{"matrix": [2, 3], "x": 16, "y": 0},
{"matrix": [2, 2], "x": 17, "y": 0},
{"matrix": [2, 1], "x": 18, "y": 0},
{"matrix": [2, 0], "x": 19, "y": 0},

{"matrix": [3, 4], "x": 20, "y": 0},
{"matrix": [3, 3], "x": 21, "y": 0},
{"matrix": [3, 2], "x": 22, "y": 0},
{"matrix": [3, 1], "x": 23, "y": 0},
{"matrix": [3, 0], "x": 24, "y": 0},

{"matrix": [4, 2], "x": 25, "y": 0},
{"matrix": [4, 3], "x": 26, "y": 0},
{"matrix": [4, 4], "x": 27, "y": 0},
{"matrix": [4, 5], "x": 28, "y": 0},
{"matrix": [4, 6], "x": 29, "y": 0},
{"matrix": [4, 7], "x": 30, "y": 0},

{"matrix": [5, 2], "x": 31, "y": 0},
{"matrix": [5, 3], "x": 32, "y": 0},
{"matrix": [5, 4], "x": 33, "y": 0},
{"matrix": [5, 5], "x": 34, "y": 0},
{"matrix": [5, 6], "x": 35, "y": 0},
{"matrix": [5, 7], "x": 36, "y": 0},

{"matrix": [6, 0], "x": 37, "y": 0},
{"matrix": [6, 1], "x": 38, "y": 0},
{"matrix": [6, 2], "x": 39, "y": 0},
{"matrix": [6, 3], "x": 40, "y": 0},
{"matrix": [6, 4], "x": 41, "y": 0},
{"matrix": [6, 5], "x": 42, "y": 0},
{"matrix": [6, 6], "x": 43, "y": 0},
{"matrix": [6, 7], "x": 44, "y": 0},

{"matrix": [7, 0], "x": 45, "y": 0},
{"matrix": [7, 1], "x": 46, "y": 0},
{"matrix": [7, 2], "x": 47, "y": 0},
{"matrix": [7, 3], "x": 48, "y": 0},
{"matrix": [7, 4], "x": 49, "y": 0}
]
}
}
}
65 changes: 2 additions & 63 deletions keyboards/splitkb/kyria/rev2/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
}
},
"layout_aliases": {
"LAYOUT_split_3x6_5": "LAYOUT"
"LAYOUT": "LAYOUT_split_3x6_5"
},
"layouts": {
"LAYOUT": {
"LAYOUT_split_3x6_5": {
"layout": [
{"matrix": [0, 7], "x": 0, "y": 0.75},
{"matrix": [0, 6], "x": 1, "y": 0.75},
Expand Down Expand Up @@ -100,67 +100,6 @@
{"matrix": [7, 3], "x": 12, "y": 3.25},
{"matrix": [7, 5], "x": 13, "y": 3.25}
]
},
"LAYOUT_stack": {
"layout": [
{"matrix": [0, 7], "x": 0, "y": 0},
{"matrix": [0, 6], "x": 1, "y": 0},
{"matrix": [0, 5], "x": 2, "y": 0},
{"matrix": [0, 4], "x": 3, "y": 0},
{"matrix": [0, 3], "x": 4, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},

{"matrix": [1, 7], "x": 6, "y": 0},
{"matrix": [1, 6], "x": 7, "y": 0},
{"matrix": [1, 5], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [1, 3], "x": 10, "y": 0},
{"matrix": [1, 2], "x": 11, "y": 0},

{"matrix": [2, 7], "x": 12, "y": 0},
{"matrix": [2, 6], "x": 13, "y": 0},
{"matrix": [2, 5], "x": 14, "y": 0},
{"matrix": [2, 4], "x": 15, "y": 0},
{"matrix": [2, 3], "x": 16, "y": 0},
{"matrix": [2, 2], "x": 17, "y": 0},
{"matrix": [2, 1], "x": 18, "y": 0},
{"matrix": [2, 0], "x": 19, "y": 0},

{"matrix": [3, 5], "x": 20, "y": 0},
{"matrix": [3, 3], "x": 21, "y": 0},
{"matrix": [3, 2], "x": 22, "y": 0},
{"matrix": [3, 1], "x": 23, "y": 0},
{"matrix": [3, 0], "x": 24, "y": 0},

{"matrix": [4, 2], "x": 25, "y": 0},
{"matrix": [4, 3], "x": 26, "y": 0},
{"matrix": [4, 4], "x": 27, "y": 0},
{"matrix": [4, 5], "x": 28, "y": 0},
{"matrix": [4, 6], "x": 29, "y": 0},
{"matrix": [4, 7], "x": 30, "y": 0},

{"matrix": [5, 2], "x": 31, "y": 0},
{"matrix": [5, 3], "x": 32, "y": 0},
{"matrix": [5, 4], "x": 33, "y": 0},
{"matrix": [5, 5], "x": 34, "y": 0},
{"matrix": [5, 6], "x": 35, "y": 0},
{"matrix": [5, 7], "x": 36, "y": 0},

{"matrix": [6, 0], "x": 37, "y": 0},
{"matrix": [6, 1], "x": 38, "y": 0},
{"matrix": [6, 2], "x": 39, "y": 0},
{"matrix": [6, 3], "x": 40, "y": 0},
{"matrix": [6, 4], "x": 41, "y": 0},
{"matrix": [6, 5], "x": 42, "y": 0},
{"matrix": [6, 6], "x": 43, "y": 0},
{"matrix": [6, 7], "x": 44, "y": 0},

{"matrix": [7, 0], "x": 45, "y": 0},
{"matrix": [7, 1], "x": 46, "y": 0},
{"matrix": [7, 2], "x": 47, "y": 0},
{"matrix": [7, 3], "x": 48, "y": 0},
{"matrix": [7, 5], "x": 49, "y": 0}
]
}
}
}
Loading

0 comments on commit 3f6c2a0

Please sign in to comment.