From 69369976477600776d2da49e6faabe558cc3e6f6 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 6 May 2023 23:02:42 -0700 Subject: [PATCH] P3D Glitch Layout Addition (#20763) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_2u_bs --- keyboards/p3d/glitch/info.json | 261 +++++++++++++++++-------- keyboards/p3d/glitch/matrix_diagram.md | 21 ++ 2 files changed, 196 insertions(+), 86 deletions(-) create mode 100644 keyboards/p3d/glitch/matrix_diagram.md diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json index 25dc17b820d8..4f323df44771 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -27,92 +27,181 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0.5, "y": 0.5}, - {"matrix": [1, 0], "x": 1.5, "y": 0.5}, - {"matrix": [0, 1], "x": 3.25, "y": 0.5}, - {"matrix": [1, 1], "x": 4.25, "y": 0.5}, - {"matrix": [0, 2], "x": 5.25, "y": 0.5}, - {"matrix": [1, 2], "x": 6.25, "y": 0.5}, - {"matrix": [0, 3], "x": 7.25, "y": 0.5}, - - {"matrix": [1, 3], "x": 10, "y": 0.5}, - {"matrix": [0, 4], "x": 11, "y": 0.5}, - {"matrix": [1, 4], "x": 12, "y": 0.5}, - {"matrix": [0, 5], "x": 13, "y": 0.5}, - {"matrix": [1, 5], "x": 14.5, "y": 0.5}, - {"matrix": [0, 6], "x": 15.5, "y": 0.5}, - {"matrix": [1, 6], "x": 16.5, "y": 0.5}, - {"matrix": [0, 7], "x": 17.5, "y": 0.5}, - - {"matrix": [1, 7], "x": 19, "y": 0}, - - {"matrix": [2, 0], "x": 0.15, "y": 1.5, "w": 1.5}, - {"matrix": [3, 0], "x": 1.65, "y": 1.5}, - {"matrix": [2, 1], "x": 3.75, "y": 1.5}, - {"matrix": [3, 1], "x": 4.75, "y": 1.5}, - {"matrix": [2, 2], "x": 5.75, "y": 1.5}, - {"matrix": [3, 2], "x": 6.75, "y": 1.5}, - - {"matrix": [3, 3], "x": 9.5, "y": 1.5}, - {"matrix": [2, 4], "x": 10.5, "y": 1.5}, - {"matrix": [3, 4], "x": 11.5, "y": 1.5}, - {"matrix": [2, 5], "x": 12.5, "y": 1.5}, - {"matrix": [3, 5], "x": 14.25, "y": 1.5}, - {"matrix": [2, 6], "x": 15.25, "y": 1.5}, - {"matrix": [3, 6], "x": 16.25, "y": 1.5}, - {"matrix": [2, 7], "x": 17.25, "y": 1.5, "w": 1.5}, - - {"matrix": [3, 7], "x": 19, "y": 1.5}, - - {"matrix": [4, 0], "x": 0.15, "y": 2.5, "w": 1.75}, - {"matrix": [5, 0], "x": 1.9, "y": 2.5}, - {"matrix": [4, 1], "x": 4, "y": 2.5}, - {"matrix": [5, 1], "x": 5, "y": 2.5}, - {"matrix": [4, 2], "x": 6, "y": 2.5}, - {"matrix": [5, 2], "x": 7, "y": 2.5}, - - {"matrix": [5, 3], "x": 9.75, "y": 2.5}, - {"matrix": [4, 4], "x": 10.75, "y": 2.5}, - {"matrix": [5, 4], "x": 11.75, "y": 2.5}, - {"matrix": [4, 5], "x": 12.75, "y": 2.5}, - {"matrix": [5, 5], "x": 14.5, "y": 2.5}, - {"matrix": [4, 6], "x": 15.5, "y": 2.5}, - {"matrix": [4, 7], "x": 16.5, "y": 2.5, "w": 2.25}, - - {"matrix": [5, 7], "x": 19, "y": 2.5}, - - {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 2.25}, - {"matrix": [6, 1], "x": 2.25, "y": 3.5}, - {"matrix": [7, 1], "x": 4.5, "y": 3.5}, - {"matrix": [6, 2], "x": 5.5, "y": 3.5}, - {"matrix": [7, 2], "x": 6.5, "y": 3.5}, - {"matrix": [6, 3], "x": 7.5, "y": 3.5}, - - {"matrix": [7, 3], "x": 9.25, "y": 3.5}, - {"matrix": [6, 4], "x": 10.25, "y": 3.5}, - {"matrix": [7, 4], "x": 11.25, "y": 3.5}, - {"matrix": [6, 5], "x": 12.25, "y": 3.5}, - {"matrix": [7, 5], "x": 14.25, "y": 3.5}, - {"matrix": [6, 6], "x": 15.25, "y": 3.5}, - {"matrix": [7, 6], "x": 16.25, "y": 3.5, "w": 1.75}, - - {"matrix": [6, 7], "x": 18.25, "y": 3.75}, - - {"matrix": [7, 7], "x": 19.5, "y": 3.5}, - - {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, - {"matrix": [9, 0], "x": 1.25, "y": 4.5, "w": 1.25}, - {"matrix": [9, 1], "x": 4.75, "y": 4.5, "w": 2.75}, - {"matrix": [9, 2], "x": 7.5, "y": 4.5, "w": 1.25}, - - {"matrix": [9, 3], "x": 9.5, "y": 4.5, "w": 1.25}, - {"matrix": [9, 4], "x": 10.75, "y": 4.5, "w": 2.25}, - {"matrix": [9, 5], "x": 15, "y": 4.5}, - {"matrix": [8, 6], "x": 16, "y": 4.5}, - - {"matrix": [9, 6], "x": 17.25, "y": 4.75}, - {"matrix": [8, 7], "x": 18.25, "y": 4.75}, - {"matrix": [9, 7], "x": 19.25, "y": 4.75} + {"label": "Esc", "matrix": [0, 0], "x": 0.5, "y": 0.5}, + {"label": "1", "matrix": [1, 0], "x": 1.5, "y": 0.5}, + {"label": "2", "matrix": [0, 1], "x": 3.25, "y": 0.5}, + {"label": "3", "matrix": [1, 1], "x": 4.25, "y": 0.5}, + {"label": "4", "matrix": [0, 2], "x": 5.25, "y": 0.5}, + {"label": "5", "matrix": [1, 2], "x": 6.25, "y": 0.5}, + {"label": "6", "matrix": [0, 3], "x": 7.25, "y": 0.5}, + + {"label": "7", "matrix": [1, 3], "x": 10, "y": 0.5}, + {"label": "8", "matrix": [0, 4], "x": 11, "y": 0.5}, + {"label": "9", "matrix": [1, 4], "x": 12, "y": 0.5}, + {"label": "0", "matrix": [0, 5], "x": 13, "y": 0.5}, + {"label": "-", "matrix": [1, 5], "x": 14.5, "y": 0.5}, + {"label": "=", "matrix": [0, 6], "x": 15.5, "y": 0.5}, + {"label": "Backspace", "matrix": [1, 6], "x": 16.5, "y": 0.5}, + {"label": "Delete", "matrix": [0, 7], "x": 17.5, "y": 0.5}, + + {"label": "Mute", "matrix": [1, 7], "x": 19, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0.15, "y": 1.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 0], "x": 1.65, "y": 1.5}, + {"label": "W", "matrix": [2, 1], "x": 3.75, "y": 1.5}, + {"label": "E", "matrix": [3, 1], "x": 4.75, "y": 1.5}, + {"label": "R", "matrix": [2, 2], "x": 5.75, "y": 1.5}, + {"label": "T", "matrix": [3, 2], "x": 6.75, "y": 1.5}, + + {"label": "Y", "matrix": [3, 3], "x": 9.5, "y": 1.5}, + {"label": "U", "matrix": [2, 4], "x": 10.5, "y": 1.5}, + {"label": "I", "matrix": [3, 4], "x": 11.5, "y": 1.5}, + {"label": "O", "matrix": [2, 5], "x": 12.5, "y": 1.5}, + {"label": "P", "matrix": [3, 5], "x": 14.25, "y": 1.5}, + {"label": "[", "matrix": [2, 6], "x": 15.25, "y": 1.5}, + {"label": "]", "matrix": [3, 6], "x": 16.25, "y": 1.5}, + {"label": "\\", "matrix": [2, 7], "x": 17.25, "y": 1.5, "w": 1.5}, + + {"label": "Page Up", "matrix": [3, 7], "x": 19, "y": 1.5}, + + {"label": "Caps Lock", "matrix": [4, 0], "x": 0.15, "y": 2.5, "w": 1.75}, + {"label": "A", "matrix": [5, 0], "x": 1.9, "y": 2.5}, + {"label": "S", "matrix": [4, 1], "x": 4, "y": 2.5}, + {"label": "D", "matrix": [5, 1], "x": 5, "y": 2.5}, + {"label": "F", "matrix": [4, 2], "x": 6, "y": 2.5}, + {"label": "G", "matrix": [5, 2], "x": 7, "y": 2.5}, + + {"label": "H", "matrix": [5, 3], "x": 9.75, "y": 2.5}, + {"label": "J", "matrix": [4, 4], "x": 10.75, "y": 2.5}, + {"label": "K", "matrix": [5, 4], "x": 11.75, "y": 2.5}, + {"label": "L", "matrix": [4, 5], "x": 12.75, "y": 2.5}, + {"label": ";", "matrix": [5, 5], "x": 14.5, "y": 2.5}, + {"label": "'", "matrix": [4, 6], "x": 15.5, "y": 2.5}, + {"label": "Enter", "matrix": [4, 7], "x": 16.5, "y": 2.5, "w": 2.25}, + + {"label": "Page Down", "matrix": [5, 7], "x": 19, "y": 2.5}, + + {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3.5}, + {"label": "X", "matrix": [7, 1], "x": 4.5, "y": 3.5}, + {"label": "C", "matrix": [6, 2], "x": 5.5, "y": 3.5}, + {"label": "V", "matrix": [7, 2], "x": 6.5, "y": 3.5}, + {"label": "B", "matrix": [6, 3], "x": 7.5, "y": 3.5}, + + {"label": "B", "matrix": [7, 3], "x": 9.25, "y": 3.5}, + {"label": "N", "matrix": [6, 4], "x": 10.25, "y": 3.5}, + {"label": "M", "matrix": [7, 4], "x": 11.25, "y": 3.5}, + {"label": ",", "matrix": [6, 5], "x": 12.25, "y": 3.5}, + {"label": ".", "matrix": [7, 5], "x": 14.25, "y": 3.5}, + {"label": "/", "matrix": [6, 6], "x": 15.25, "y": 3.5}, + {"label": "Shift", "matrix": [7, 6], "x": 16.25, "y": 3.5, "w": 1.75}, + + {"label": "\u2191", "matrix": [6, 7], "x": 18.25, "y": 3.75}, + + {"label": "End", "matrix": [7, 7], "x": 19.5, "y": 3.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4.5, "w": 1.25}, + {"label": "Alt", "matrix": [9, 1], "x": 4.75, "y": 4.5, "w": 2.75}, + {"label": "Space", "matrix": [9, 2], "x": 7.5, "y": 4.5, "w": 1.25}, + + {"label": "Space", "matrix": [9, 3], "x": 9.5, "y": 4.5, "w": 1.25}, + {"label": "Alt", "matrix": [9, 4], "x": 10.75, "y": 4.5, "w": 2.25}, + {"label": "GUI", "matrix": [9, 5], "x": 15, "y": 4.5}, + {"label": "Ctrl", "matrix": [8, 6], "x": 16, "y": 4.5}, + + {"label": "\u2190", "matrix": [9, 6], "x": 17.25, "y": 4.75}, + {"label": "\u2193", "matrix": [8, 7], "x": 18.25, "y": 4.75}, + {"label": "\u2192", "matrix": [9, 7], "x": 19.25, "y": 4.75} + ] + }, + "LAYOUT_2u_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0.5, "y": 0.5}, + {"label": "1", "matrix": [1, 0], "x": 1.5, "y": 0.5}, + {"label": "2", "matrix": [0, 1], "x": 3.25, "y": 0.5}, + {"label": "3", "matrix": [1, 1], "x": 4.25, "y": 0.5}, + {"label": "4", "matrix": [0, 2], "x": 5.25, "y": 0.5}, + {"label": "5", "matrix": [1, 2], "x": 6.25, "y": 0.5}, + {"label": "6", "matrix": [0, 3], "x": 7.25, "y": 0.5}, + + {"label": "7", "matrix": [1, 3], "x": 10, "y": 0.5}, + {"label": "8", "matrix": [0, 4], "x": 11, "y": 0.5}, + {"label": "9", "matrix": [1, 4], "x": 12, "y": 0.5}, + {"label": "0", "matrix": [0, 5], "x": 13, "y": 0.5}, + {"label": "-", "matrix": [1, 5], "x": 14.5, "y": 0.5}, + {"label": "=", "matrix": [0, 6], "x": 15.5, "y": 0.5}, + {"label": "Backspace", "matrix": [1, 6], "x": 16.5, "y": 0.5, "w": 2}, + + {"label": "Mute", "matrix": [1, 7], "x": 19, "y": 0}, + + {"label": "Tab", "matrix": [2, 0], "x": 0.15, "y": 1.5, "w": 1.5}, + {"label": "Q", "matrix": [3, 0], "x": 1.65, "y": 1.5}, + {"label": "W", "matrix": [2, 1], "x": 3.75, "y": 1.5}, + {"label": "E", "matrix": [3, 1], "x": 4.75, "y": 1.5}, + {"label": "R", "matrix": [2, 2], "x": 5.75, "y": 1.5}, + {"label": "T", "matrix": [3, 2], "x": 6.75, "y": 1.5}, + + {"label": "Y", "matrix": [3, 3], "x": 9.5, "y": 1.5}, + {"label": "U", "matrix": [2, 4], "x": 10.5, "y": 1.5}, + {"label": "I", "matrix": [3, 4], "x": 11.5, "y": 1.5}, + {"label": "O", "matrix": [2, 5], "x": 12.5, "y": 1.5}, + {"label": "P", "matrix": [3, 5], "x": 14.25, "y": 1.5}, + {"label": "[", "matrix": [2, 6], "x": 15.25, "y": 1.5}, + {"label": "]", "matrix": [3, 6], "x": 16.25, "y": 1.5}, + {"label": "\\", "matrix": [2, 7], "x": 17.25, "y": 1.5, "w": 1.5}, + + {"label": "Page Up", "matrix": [3, 7], "x": 19, "y": 1.5}, + + {"label": "Caps Lock", "matrix": [4, 0], "x": 0.15, "y": 2.5, "w": 1.75}, + {"label": "A", "matrix": [5, 0], "x": 1.9, "y": 2.5}, + {"label": "S", "matrix": [4, 1], "x": 4, "y": 2.5}, + {"label": "D", "matrix": [5, 1], "x": 5, "y": 2.5}, + {"label": "F", "matrix": [4, 2], "x": 6, "y": 2.5}, + {"label": "G", "matrix": [5, 2], "x": 7, "y": 2.5}, + + {"label": "H", "matrix": [5, 3], "x": 9.75, "y": 2.5}, + {"label": "J", "matrix": [4, 4], "x": 10.75, "y": 2.5}, + {"label": "K", "matrix": [5, 4], "x": 11.75, "y": 2.5}, + {"label": "L", "matrix": [4, 5], "x": 12.75, "y": 2.5}, + {"label": ";", "matrix": [5, 5], "x": 14.5, "y": 2.5}, + {"label": "'", "matrix": [4, 6], "x": 15.5, "y": 2.5}, + {"label": "Enter", "matrix": [4, 7], "x": 16.5, "y": 2.5, "w": 2.25}, + + {"label": "Page Down", "matrix": [5, 7], "x": 19, "y": 2.5}, + + {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3.5}, + {"label": "X", "matrix": [7, 1], "x": 4.5, "y": 3.5}, + {"label": "C", "matrix": [6, 2], "x": 5.5, "y": 3.5}, + {"label": "V", "matrix": [7, 2], "x": 6.5, "y": 3.5}, + {"label": "B", "matrix": [6, 3], "x": 7.5, "y": 3.5}, + + {"label": "B", "matrix": [7, 3], "x": 9.25, "y": 3.5}, + {"label": "N", "matrix": [6, 4], "x": 10.25, "y": 3.5}, + {"label": "M", "matrix": [7, 4], "x": 11.25, "y": 3.5}, + {"label": ",", "matrix": [6, 5], "x": 12.25, "y": 3.5}, + {"label": ".", "matrix": [7, 5], "x": 14.25, "y": 3.5}, + {"label": "/", "matrix": [6, 6], "x": 15.25, "y": 3.5}, + {"label": "Shift", "matrix": [7, 6], "x": 16.25, "y": 3.5, "w": 1.75}, + + {"label": "\u2191", "matrix": [6, 7], "x": 18.25, "y": 3.75}, + + {"label": "End", "matrix": [7, 7], "x": 19.5, "y": 3.5}, + + {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4.5, "w": 1.25}, + {"label": "Alt", "matrix": [9, 1], "x": 4.75, "y": 4.5, "w": 2.75}, + {"label": "Space", "matrix": [9, 2], "x": 7.5, "y": 4.5, "w": 1.25}, + + {"label": "Space", "matrix": [9, 3], "x": 9.5, "y": 4.5, "w": 1.25}, + {"label": "Alt", "matrix": [9, 4], "x": 10.75, "y": 4.5, "w": 2.25}, + {"label": "GUI", "matrix": [9, 5], "x": 15, "y": 4.5}, + {"label": "Ctrl", "matrix": [8, 6], "x": 16, "y": 4.5}, + + {"label": "\u2190", "matrix": [9, 6], "x": 17.25, "y": 4.75}, + {"label": "\u2193", "matrix": [8, 7], "x": 18.25, "y": 4.75}, + {"label": "\u2192", "matrix": [9, 7], "x": 19.25, "y": 4.75} ] } } diff --git a/keyboards/p3d/glitch/matrix_diagram.md b/keyboards/p3d/glitch/matrix_diagram.md new file mode 100644 index 000000000000..be3874f4f320 --- /dev/null +++ b/keyboards/p3d/glitch/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for P3D Glitch + +``` + ┌───────┐ + 2u Backspace │16 │ + └───────┘┌───┐ + ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐│17 │ + │00 │10 │01 │11 │02 │12 │03 │ │13 │04 │14 │05 │15 │06 │16 │07 │└───┘ +┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤┌───┐ +│20 │30 │21 │31 │22 │32 │ │33 │24 │34 │25 │35 │26 │36 │27 ││37 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤ +│40 │50 │41 │51 │42 │52 │ │53 │44 │54 │45 │55 │46 │47 ││57 │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴─────┬──┘└─┬─┴─┐ +│60 │61 │71 │62 │72 │63 │ │73 │64 │74 │65 │75 │66 │76 │┌───┐│77 │ +├────┬───┴┬──┴┬──┴───┴───┼───┴┐ └┬──┴─┬─┴───┴──┬┴──┬┴──┬┴──┬───┘│67 │└───┘ +│80 │90 │ │91 │92 │ │93 │94 │ │95 │86 │┌───┼───┼───┐ +└────┴────┘ └──────────┴────┘ └────┴────────┘ └───┴───┘│96 │87 │97 │ + ┌────┬──────────┐ ┌────────┬────┐ └───┴───┴───┘ + │91 │92 │ │93 │94 │ + └────┴──────────┘ └────────┴────┘ +```