Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kinesis: remove stacked split layouts #21569

Merged
merged 1 commit into from
Jul 21, 2023
Merged

kinesis: remove stacked split layouts #21569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 0 additions & 90 deletions keyboards/kinesis/alvicstep/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,96 +10,6 @@
"bootloader": "halfkay",
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 2], "x": 1.39, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [0, 1], "x": 2.09, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 1], "x": 2.78, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 1], "x": 3.48, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [0, 0], "x": 4.17, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 0], "x": 4.87, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 0], "x": 5.56, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [8, 0], "x": 0, "y": 1.25, "w": 1.25},
{"matrix": [7, 0], "x": 1.25, "y": 1.25},
{"matrix": [6, 0], "x": 2.25, "y": 1},
{"matrix": [5, 0], "x": 3.25, "y": 1},
{"matrix": [4, 0], "x": 4.25, "y": 1},
{"matrix": [3, 0], "x": 5.25, "y": 1},
{"matrix": [8, 1], "x": 0, "y": 2.25, "w": 1.25},
{"matrix": [7, 1], "x": 1.25, "y": 2.25},
{"matrix": [6, 1], "x": 2.25, "y": 2},
{"matrix": [5, 1], "x": 3.25, "y": 2},
{"matrix": [4, 1], "x": 4.25, "y": 2},
{"matrix": [3, 1], "x": 5.25, "y": 2},
{"matrix": [8, 2], "x": 0, "y": 3.25, "w": 1.25},
{"matrix": [7, 2], "x": 1.25, "y": 3.25},
{"matrix": [6, 2], "x": 2.25, "y": 3},
{"matrix": [5, 2], "x": 3.25, "y": 3},
{"matrix": [4, 2], "x": 4.25, "y": 3},
{"matrix": [3, 2], "x": 5.25, "y": 3},
{"matrix": [8, 3], "x": 0, "y": 4.25, "w": 1.25},
{"matrix": [7, 3], "x": 1.25, "y": 4.25},
{"matrix": [6, 3], "x": 2.25, "y": 4},
{"matrix": [5, 3], "x": 3.25, "y": 4},
{"matrix": [4, 3], "x": 4.25, "y": 4},
{"matrix": [3, 3], "x": 5.25, "y": 4},
{"matrix": [7, 4], "x": 1.25, "y": 5.25},
{"matrix": [6, 4], "x": 2.25, "y": 5},
{"matrix": [5, 4], "x": 3.25, "y": 5},
{"matrix": [3, 4], "x": 4.25, "y": 5},
{"matrix": [3, 6], "x": 5.25, "y": 6},
{"matrix": [3, 5], "x": 6.25, "y": 6},
{"matrix": [5, 5], "x": 6.25, "y": 7},
{"matrix": [5, 6], "x": 4.25, "y": 7, "h": 2},
{"matrix": [4, 6], "x": 5.25, "y": 7, "h": 2},
{"matrix": [7, 5], "x": 6.25, "y": 8},
{"matrix": [0, 3], "x": 9.25, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 3], "x": 9.95, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 3], "x": 10.64, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [0, 4], "x": 11.34, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 4], "x": 12.03, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [1, 4], "x": 12.73, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [0, 5], "x": 13.42, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [8, 5], "x": 14.12, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [8, 4], "x": 14.81, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [9, 4], "x": 9.25, "y": 1},
{"matrix": [10, 4], "x": 10.25, "y": 1},
{"matrix": [11, 4], "x": 11.25, "y": 1},
{"matrix": [13, 4], "x": 12.25, "y": 1},
{"matrix": [14, 4], "x": 13.25, "y": 1.25},
{"matrix": [15, 4], "x": 14.25, "y": 1.25, "w": 1.25},
{"matrix": [9, 5], "x": 9.25, "y": 2},
{"matrix": [10, 5], "x": 10.25, "y": 2},
{"matrix": [11, 5], "x": 11.25, "y": 2},
{"matrix": [13, 5], "x": 12.25, "y": 2},
{"matrix": [14, 5], "x": 13.25, "y": 2.25},
{"matrix": [15, 5], "x": 14.25, "y": 2.25, "w": 1.25},
{"matrix": [9, 6], "x": 9.25, "y": 3},
{"matrix": [10, 6], "x": 10.25, "y": 3},
{"matrix": [11, 6], "x": 11.25, "y": 3},
{"matrix": [13, 6], "x": 12.25, "y": 3},
{"matrix": [14, 6], "x": 13.25, "y": 3.25},
{"matrix": [15, 6], "x": 14.25, "y": 3.25, "w": 1.25},
{"matrix": [9, 7], "x": 9.25, "y": 4},
{"matrix": [10, 7], "x": 10.25, "y": 4},
{"matrix": [11, 7], "x": 11.25, "y": 4},
{"matrix": [13, 7], "x": 12.25, "y": 4},
{"matrix": [14, 7], "x": 13.25, "y": 4.25},
{"matrix": [15, 7], "x": 14.25, "y": 4.25, "w": 1.25},
{"matrix": [9, 3], "x": 10.25, "y": 5},
{"matrix": [11, 3], "x": 11.25, "y": 5},
{"matrix": [13, 3], "x": 12.25, "y": 5},
{"matrix": [14, 3], "x": 13.25, "y": 5.25},
{"matrix": [4, 7], "x": 8.25, "y": 6},
{"matrix": [6, 6], "x": 9.25, "y": 6},
{"matrix": [6, 7], "x": 8.25, "y": 7},
{"matrix": [8, 7], "x": 8.25, "y": 8},
{"matrix": [7, 6], "x": 9.25, "y": 7, "h": 2},
{"matrix": [8, 6], "x": 10.25, "y": 7, "h": 2}
]
},
"LAYOUT_pretty": {
"layout": [
{"matrix": [0, 2], "x": 0, "y": 0, "w": 0.69, "h": 0.85},
{"matrix": [2, 2], "x": 0.7, "y": 0, "w": 0.69, "h": 0.85},
Expand Down
33 changes: 13 additions & 20 deletions keyboards/kinesis/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,17 @@
*/

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[QWERTY] = LAYOUT(
KC_ESC, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,KC_F8,
KC_EQL, KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,
KC_TAB, KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,
KC_CAPS,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,
KC_GRV ,KC_INS ,KC_LEFT,KC_RGHT,
KC_LCTL,KC_LALT,
KC_HOME,
KC_BSPC,KC_DEL ,KC_END ,
KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR ,KC_SCRL ,KC_PAUS, KC_NO, QK_BOOT,
KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,
KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,KC_BSLS,
KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN,KC_QUOT,
KC_N ,KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
KC_UP ,KC_DOWN,KC_LBRC,KC_RBRC,
KC_RGUI,KC_RCTL,
KC_PGUP,
KC_PGDN,KC_ENTER ,KC_SPC
)

[QWERTY] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_GRV, KC_INS, KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
KC_HOME, KC_PGUP,
KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENTER, KC_SPC
)

};
46 changes: 0 additions & 46 deletions keyboards/kinesis/keymaps/default_pretty/keymap.c
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions keyboards/kinesis/keymaps/default_pretty/readme.md
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions keyboards/kinesis/keymaps/default_pretty/rules.mk
View file
Open in desktop

This file was deleted.

62 changes: 20 additions & 42 deletions keyboards/kinesis/keymaps/dvorak/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,29 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_DVORAK] = LAYOUT(
// left hand
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y,
KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X,
KC_GRV, KC_INS, KC_LEFT, KC_RIGHT,
// left thumb
KC_LCTL, KC_LALT,
KC_HOME,
KC_BSPC, KC_DEL, KC_END,
// right hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
// right thumb
KC_RGUI, KC_RCTL,
KC_PGUP,
KC_PGDN, KC_ENT, KC_SPC
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, QK_BOOT,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
KC_GRV, KC_INS, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,

KC_LCTL, KC_LALT, KC_RGUI, KC_RCTL,
KC_HOME, KC_PGUP,
KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENT, KC_SPC
),

[_MEDIA] = LAYOUT(
// left hand
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO,
KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
KC_NO, KC_NO, KC_MS_D, KC_MS_U,
// left thumb
KC_NO, KC_NO,
KC_NO,
KC_NO, KC_NO, KC_TRNS,
// right hand
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PWR,
KC_NO, KC_VOLU, KC_MS_U, KC_VOLD, KC_NO, KC_NO,
KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO,
KC_MS_L, KC_MS_R, KC_NO, KC_NO,
// right thumb
KC_NO, KC_NO,
KC_NO,
KC_TRNS, KC_ENT, KC_NO
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PWR,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, KC_MS_U, KC_VOLD, KC_NO, KC_NO,
KC_NO, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO,
KC_NO, KC_NO, KC_MS_D, KC_MS_U, KC_MS_L, KC_MS_R, KC_NO, KC_NO,

KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO,
KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_ENT, KC_NO
)
};
31 changes: 10 additions & 21 deletions keyboards/kinesis/keymaps/dvorak_nguyenvietyen/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,15 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[DVORAK_MAC_MODE] = LAYOUT(
// left hand
KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y,
KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X,
KC_GRV, KC_INS, KC_LEFT, KC_RIGHT,
// left thumb
KC_LGUI, KC_LALT,
KC_HOME,
KC_BSPC, KC_DEL, KC_END,
// right hand
KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NUM, KC_PWR,
KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,
// right thumb
KC_RCTL, KC_RGUI,
KC_PGUP,
KC_PGDN, KC_ENT, KC_SPC
KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_NUM, KC_PWR,
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_BSLS,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
KC_GRV, KC_INS, KC_LEFT, KC_RIGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC,

KC_LGUI, KC_LALT, KC_RCTL, KC_RGUI,
KC_HOME, KC_PGUP,
KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_ENT, KC_SPC
)
};
Loading
Loading