From bd052e5e754d3628e1ba7c0be2a3f2f55f04f60d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 13:50:29 -0700 Subject: [PATCH 1/8] add matrix_diagram.md --- keyboards/irene/matrix_diagram.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 keyboards/irene/matrix_diagram.md diff --git a/keyboards/irene/matrix_diagram.md b/keyboards/irene/matrix_diagram.md new file mode 100644 index 000000000000..fc0f9c64ff91 --- /dev/null +++ b/keyboards/irene/matrix_diagram.md @@ -0,0 +1,15 @@ +# Matrix Diagram for Irene + +``` +┌───┐┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ +│00 ││01 │02 │03 │04 │05 │06 │47 │ │07 │08 │09 │0A │0B │0C │0D │0E │ │0E │ 2u Backspace +├───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └───────┘ +│10 ││11 │12 │13 │14 │15 │16 │ │17 │18 │19 │1A │1B │1C │1D │1E │ +├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +│20 ││21 │22 │23 │24 │25 │26 │ │27 │28 │29 │2A │2B │2C │2E │ +└───┘├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌──────────┐ + │31 │32 │33 │34 │35 │36 │ │37 │38 │39 │3A │3B │3C │3D │3E │ │3D │ 2.75u RShift + ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴──┬───┴─┬─┘ └──────────┘ + │41 │ │43 │44 │46 │ │48 │4A │ │4E │ + └─────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘ +``` From 8df273f9b7a4b6702bf2c945b1f0442b80d84e33 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 13:53:58 -0700 Subject: [PATCH 2/8] info.json: apply friendly formatting --- keyboards/irene/info.json | 132 +++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index cce2ab7316eb..a1230fac5b57 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -21,76 +21,76 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0.5, "y": 0}, - {"matrix": [0, 1], "x": 1.75, "y": 0}, - {"matrix": [0, 2], "x": 2.75, "y": 0}, - {"matrix": [0, 3], "x": 3.75, "y": 0}, - {"matrix": [0, 4], "x": 4.75, "y": 0}, - {"matrix": [0, 5], "x": 5.75, "y": 0}, - {"matrix": [0, 6], "x": 6.75, "y": 0}, - {"matrix": [4, 7], "x": 7.75, "y": 0}, - {"matrix": [0, 7], "x": 10, "y": 0}, - {"matrix": [0, 8], "x": 11, "y": 0}, - {"matrix": [0, 9], "x": 12, "y": 0}, - {"matrix": [0, 10], "x": 13, "y": 0}, - {"matrix": [0, 11], "x": 14, "y": 0}, - {"matrix": [0, 12], "x": 15, "y": 0}, - {"matrix": [0, 13], "x": 16, "y": 0}, - {"matrix": [0, 14], "x": 17, "y": 0}, + {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, + {"label": "Esc", "matrix": [0, 1], "x": 1.75, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.75, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.75, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.75, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "6", "matrix": [4, 7], "x": 7.75, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 10, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 11, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 12, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 13, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 14, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 15, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 16, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 17, "y": 0}, - {"matrix": [1, 0], "x": 0.25, "y": 1}, - {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, - {"matrix": [1, 2], "x": 3, "y": 1}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1}, - {"matrix": [1, 5], "x": 6, "y": 1}, - {"matrix": [1, 6], "x": 7, "y": 1}, - {"matrix": [1, 7], "x": 9.5, "y": 1}, - {"matrix": [1, 8], "x": 10.5, "y": 1}, - {"matrix": [1, 9], "x": 11.5, "y": 1}, - {"matrix": [1, 10], "x": 12.5, "y": 1}, - {"matrix": [1, 11], "x": 13.5, "y": 1}, - {"matrix": [1, 12], "x": 14.5, "y": 1}, - {"matrix": [1, 13], "x": 15.5, "y": 1}, - {"matrix": [1, 14], "x": 16.5, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 0], "x": 0.25, "y": 1}, + {"label": "Tab", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 9.5, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 10.5, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 11.5, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 12.5, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 13.5, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 14.5, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 15.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 16.5, "y": 1, "w": 1.5}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, - {"matrix": [2, 2], "x": 3.25, "y": 2}, - {"matrix": [2, 3], "x": 4.25, "y": 2}, - {"matrix": [2, 4], "x": 5.25, "y": 2}, - {"matrix": [2, 5], "x": 6.25, "y": 2}, - {"matrix": [2, 6], "x": 7.25, "y": 2}, - {"matrix": [2, 7], "x": 9.75, "y": 2}, - {"matrix": [2, 8], "x": 10.75, "y": 2}, - {"matrix": [2, 9], "x": 11.75, "y": 2}, - {"matrix": [2, 10], "x": 12.75, "y": 2}, - {"matrix": [2, 11], "x": 13.75, "y": 2}, - {"matrix": [2, 12], "x": 14.75, "y": 2}, - {"matrix": [2, 14], "x": 15.75, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3.25, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 9.75, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 10.75, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 11.75, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 12.75, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 13.75, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 14.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.75, "y": 2, "w": 2.25}, - {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 3.75, "y": 3}, - {"matrix": [3, 3], "x": 4.75, "y": 3}, - {"matrix": [3, 4], "x": 5.75, "y": 3}, - {"matrix": [3, 5], "x": 6.75, "y": 3}, - {"matrix": [3, 6], "x": 7.75, "y": 3}, - {"matrix": [3, 7], "x": 9.25, "y": 3}, - {"matrix": [3, 8], "x": 10.25, "y": 3}, - {"matrix": [3, 9], "x": 11.25, "y": 3}, - {"matrix": [3, 10], "x": 12.25, "y": 3}, - {"matrix": [3, 11], "x": 13.25, "y": 3}, - {"matrix": [3, 12], "x": 14.25, "y": 3}, - {"matrix": [3, 13], "x": 15.25, "y": 3, "w": 1.75}, - {"matrix": [3, 14], "x": 17, "y": 3}, + {"label": "Shift", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 3.75, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 9.25, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 10.25, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 11.25, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 12.25, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 13.25, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 14.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 15.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3}, - {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, - {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, - {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, - {"matrix": [4, 6], "x": 7.5, "y": 4, "w": 1.25}, - {"matrix": [4, 8], "x": 9.25, "y": 4, "w": 2.75}, - {"matrix": [4, 10], "x": 12, "y": 4, "w": 1.5}, - {"matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, + {"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 8], "x": 9.25, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 10], "x": 12, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} ] } } From a54ba57f3e00c05a190f7f8204aa25a341e2f640 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 14:00:24 -0700 Subject: [PATCH 3/8] rename LAYOUT_all to LAYOUT_alice_split_bs --- keyboards/irene/info.json | 5 ++++- keyboards/irene/keymaps/default/keymap.c | 4 ++-- keyboards/irene/keymaps/via/keymap.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index a1230fac5b57..957de3956446 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -18,8 +18,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_alice_split_bs" + }, "layouts": { - "LAYOUT_all": { + "LAYOUT_alice_split_bs": { "layout": [ {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, {"label": "Esc", "matrix": [0, 1], "x": 1.75, "y": 0}, diff --git a/keyboards/irene/keymaps/default/keymap.c b/keyboards/irene/keymaps/default/keymap.c index 7f71da3079e8..1e12a2051cd0 100644 --- a/keyboards/irene/keymaps/default/keymap.c +++ b/keyboards/irene/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_alice_split_bs( KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 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_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT_alice_split_bs( QK_BOOT, _______, 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_DEL, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/irene/keymaps/via/keymap.c b/keyboards/irene/keymaps/via/keymap.c index 7f71da3079e8..1e12a2051cd0 100644 --- a/keyboards/irene/keymaps/via/keymap.c +++ b/keyboards/irene/keymaps/via/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_alice_split_bs( KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, 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_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT_alice_split_bs( QK_BOOT, _______, 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_DEL, KC_DEL, KC_HOME, _______, _______, KC_UP, _______, _______, _______, RGB_HUD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_VAI, _______, _______, _______, KC_END, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, From f8bed78b8684661da9cf8f3ce03671f24284eadb Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 14:01:01 -0700 Subject: [PATCH 4/8] add LAYOUT_alice --- keyboards/irene/info.json | 74 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index 957de3956446..e05733596a50 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -22,6 +22,80 @@ "LAYOUT_all": "LAYOUT_alice_split_bs" }, "layouts": { + "LAYOUT_alice": { + "layout": [ + {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, + {"label": "Esc", "matrix": [0, 1], "x": 1.75, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.75, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.75, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.75, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "6", "matrix": [4, 7], "x": 7.75, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 10, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 11, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 12, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 13, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 14, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 15, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 16, "y": 0, "w": 2}, + + {"label": "Page Up", "matrix": [1, 0], "x": 0.25, "y": 1}, + {"label": "Tab", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 9.5, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 10.5, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 11.5, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 12.5, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 13.5, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 14.5, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 15.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 16.5, "y": 1, "w": 1.5}, + + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3.25, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 9.75, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 10.75, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 11.75, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 12.75, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 13.75, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 14.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.75, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 3.75, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 9.25, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 10.25, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 11.25, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 12.25, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 13.25, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 14.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 15.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, + {"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 8], "x": 9.25, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 10], "x": 12, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_alice_split_bs": { "layout": [ {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, From 91faad57b23414ca9839af4ed24d148a79651f43 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 14:01:50 -0700 Subject: [PATCH 5/8] add LAYOUT_alice_full_rshift --- keyboards/irene/info.json | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index e05733596a50..51acd523b28f 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -161,6 +161,79 @@ {"label": "Shift", "matrix": [3, 13], "x": 15.25, "y": 3, "w": 1.75}, {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, + {"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 8], "x": 9.25, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 10], "x": 12, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} + ] + }, + + "LAYOUT_alice_full_rshift": { + "layout": [ + {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, + {"label": "Esc", "matrix": [0, 1], "x": 1.75, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.75, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.75, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.75, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "6", "matrix": [4, 7], "x": 7.75, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 10, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 11, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 12, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 13, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 14, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 15, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 16, "y": 0, "w": 2}, + + {"label": "Page Up", "matrix": [1, 0], "x": 0.25, "y": 1}, + {"label": "Tab", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 9.5, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 10.5, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 11.5, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 12.5, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 13.5, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 14.5, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 15.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 16.5, "y": 1, "w": 1.5}, + + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3.25, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 9.75, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 10.75, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 11.75, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 12.75, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 13.75, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 14.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.75, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 3.75, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 9.25, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 10.25, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 11.25, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 12.25, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 13.25, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 14.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 15.25, "y": 3, "w": 2.75}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, {"label": "Alt", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, {"label": "Space", "matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, From 367e5ac494e962e480259c1f4cabe968150a73fe Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 14:02:06 -0700 Subject: [PATCH 6/8] add LAYOUT_alice_split_bs_full_rshift --- keyboards/irene/info.json | 74 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index 51acd523b28f..23fbb8d9d5fa 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -234,6 +234,80 @@ {"label": "/", "matrix": [3, 12], "x": 14.25, "y": 3}, {"label": "Shift", "matrix": [3, 13], "x": 15.25, "y": 3, "w": 2.75}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"label": "Alt", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, + {"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 8], "x": 9.25, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 10], "x": 12, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} + ] + }, + + "LAYOUT_alice_split_bs_full_rshift": { + "layout": [ + {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, + {"label": "Esc", "matrix": [0, 1], "x": 1.75, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.75, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.75, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.75, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "6", "matrix": [4, 7], "x": 7.75, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 10, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 11, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 12, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 13, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 14, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 15, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 16, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 17, "y": 0}, + + {"label": "Page Up", "matrix": [1, 0], "x": 0.25, "y": 1}, + {"label": "Tab", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 3, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 9.5, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 10.5, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 11.5, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 12.5, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 13.5, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 14.5, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 15.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 16.5, "y": 1, "w": 1.5}, + + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3.25, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 9.75, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 10.75, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 11.75, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 12.75, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 13.75, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 14.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.75, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 3.75, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 9.25, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 10.25, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 11.25, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 12.25, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 13.25, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 14.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 15.25, "y": 3, "w": 2.75}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, {"label": "Alt", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, {"label": "Space", "matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, From 0c4cead979afc484df6a3e01fd7d1a58ef75ee2f Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 14:02:18 -0700 Subject: [PATCH 7/8] enable Community Layout support --- keyboards/irene/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index 23fbb8d9d5fa..20830695672f 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -21,6 +21,10 @@ "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs" }, + "community_layouts": [ + "alice", + "alice_split_bs" + ], "layouts": { "LAYOUT_alice": { "layout": [ From 925f21e85376de904579e3fbe4abbc43d5269aa2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 3 May 2023 01:24:20 -0700 Subject: [PATCH 8/8] Apply suggestions from code review Co-authored-by: Ryan --- keyboards/irene/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/irene/info.json b/keyboards/irene/info.json index 20830695672f..000a34364700 100644 --- a/keyboards/irene/info.json +++ b/keyboards/irene/info.json @@ -99,7 +99,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_alice_split_bs": { "layout": [ {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, @@ -174,7 +173,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_alice_full_rshift": { "layout": [ {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0}, @@ -247,7 +245,6 @@ {"label": "Ctrl", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_alice_split_bs_full_rshift": { "layout": [ {"label": "Delete", "matrix": [0, 0], "x": 0.5, "y": 0},