From bcc5397c9281877690f54b33959012ee545f4cc1 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 8 May 2023 12:18:07 -0700 Subject: Peej Rosaline Staggered Layout Additions (#20774) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_tsangan_split_rshift * add LAYOUT_tsangan --- keyboards/peej/rosaline/staggered/info.json | 209 ++++++++++++++++----- .../peej/rosaline/staggered/matrix_diagram.md | 33 ++++ 2 files changed, 191 insertions(+), 51 deletions(-) create mode 100644 keyboards/peej/rosaline/staggered/matrix_diagram.md diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json index 99796675e1..0679203163 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/info.json @@ -22,60 +22,167 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, - {"matrix": [1, 0], "x": 1.5, "y": 0}, - {"matrix": [0, 1], "x": 2.5, "y": 0}, - {"matrix": [0, 2], "x": 3.5, "y": 0}, - {"matrix": [1, 2], "x": 4.5, "y": 0}, - {"matrix": [0, 3], "x": 5.5, "y": 0}, - {"matrix": [1, 3], "x": 6.5, "y": 0}, - {"matrix": [0, 4], "x": 7.5, "y": 0}, - {"matrix": [1, 4], "x": 8.5, "y": 0}, - {"matrix": [0, 5], "x": 9.5, "y": 0}, - {"matrix": [0, 6], "x": 10.5, "y": 0}, - {"matrix": [1, 6], "x": 11.5, "y": 0}, - {"matrix": [0, 7], "x": 12.5, "y": 0}, - {"matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, - {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, - {"matrix": [1, 1], "x": 1.75, "y": 1}, - {"matrix": [2, 1], "x": 2.75, "y": 1}, - {"matrix": [2, 2], "x": 3.75, "y": 1}, - {"matrix": [3, 2], "x": 4.75, "y": 1}, - {"matrix": [2, 3], "x": 5.75, "y": 1}, - {"matrix": [3, 3], "x": 6.75, "y": 1}, - {"matrix": [2, 4], "x": 7.75, "y": 1}, - {"matrix": [1, 5], "x": 8.75, "y": 1}, - {"matrix": [2, 5], "x": 9.75, "y": 1}, - {"matrix": [2, 6], "x": 10.75, "y": 1}, - {"matrix": [3, 6], "x": 11.75, "y": 1}, - {"matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, - {"matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, - {"matrix": [3, 1], "x": 2.25, "y": 2}, - {"matrix": [4, 1], "x": 3.25, "y": 2}, - {"matrix": [4, 2], "x": 4.25, "y": 2}, - {"matrix": [4, 3], "x": 5.25, "y": 2}, - {"matrix": [5, 3], "x": 6.25, "y": 2}, - {"matrix": [3, 4], "x": 7.25, "y": 2}, - {"matrix": [4, 4], "x": 8.25, "y": 2}, - {"matrix": [3, 5], "x": 9.25, "y": 2}, - {"matrix": [4, 5], "x": 10.25, "y": 2}, - {"matrix": [4, 6], "x": 11.25, "y": 2}, - {"matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, - {"matrix": [4, 7], "x": 14, "y": 2}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, + {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, - {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, - {"matrix": [5, 0], "x": 1.5, "y": 3}, - {"matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, - {"matrix": [5, 2], "x": 4, "y": 3, "w": 2.75}, - {"matrix": [5, 4], "x": 6.75, "y": 3}, - {"matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25}, - {"matrix": [6, 5], "x": 10, "y": 3}, - {"matrix": [5, 6], "x": 11, "y": 3}, - {"matrix": [6, 6], "x": 12, "y": 3}, - {"matrix": [5, 7], "x": 13, "y": 3}, - {"matrix": [6, 7], "x": 14, "y": 3} + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75}, + {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3}, + {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25}, + {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3}, + {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3}, + {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3}, + {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3}, + {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3} + ] + }, + "LAYOUT_tsangan": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, + {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, + {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_tsangan_split_rshift": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, + {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, + {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, + {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/peej/rosaline/staggered/matrix_diagram.md b/keyboards/peej/rosaline/staggered/matrix_diagram.md new file mode 100644 index 0000000000..5e004aae7b --- /dev/null +++ b/keyboards/peej/rosaline/staggered/matrix_diagram.md @@ -0,0 +1,33 @@ +# Matrix Diagram for Peej Rosaline Staggered + +``` +┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +│00 │10 │01 │02 │12 │03 │13 │04 │14 │05 │06 │16 │07 │17 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ +│20 │11 │21 │22 │32 │23 │33 │24 │15 │25 │26 │36 │27 │ +└──────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────────┘ +─ Shift Row ───────────────────────────────────────────────── +┌────────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────────────┐ ┌───┬──────┬───┐ +│30 │31 │41 │42 │43 │53 │34 │44 │35 │45 │ [RShift]──── │ ─┬─ │46 │37 │47 │ 1u/1.75u/1u +└────────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴──────────────┘ │ └───┴──────┴───┘ + │ ┌──────┬───┬───┐ + ├─ │46 │37 │47 │ 1.75u/1u/1u + │ └──────┴───┴───┘ + │ ┌───┬──────────┐ + └─ │46 │37 │ 1u/2.75u + └───┴──────────┘ +─ Bottom Row ──────────────────────────────────────────────── +┌─────┬───┬─────┬───────────────────────────┬───────────────┐ ┌───┬───┬───┬───┐ +│40 │50 │51 │ [Spacebar]─┐ │ [Bot. Right]─ │ ─┬─ │56 │66 │57 │67 │ 1u +└─────┴───┴─────┴───────────────────────────┴───────────────┘ │ └───┴───┴───┴───┘ + ┌────────────┴──────────────┐ │ ┌─────┬───┬─────┐ + ┌──────────┬────────┬───┬───┐ └─ │56 │66 │57 │ Tsangan + Split │52 │54 │55 │65 │ └─────┴───┴─────┘ + └──────────┴────────┴───┴───┘ + ┌──────────┬───┬────────┬───┐ + Split Fn │52 │54 │55 │65 │ + └──────────┴───┴────────┴───┘ + ┌───────────────────────────┐ + 7u Spacebar │54 │ + └───────────────────────────┘ +``` -- cgit v1.2.3