Noxary Valhalla Layout Addition (#20752)

* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_2u_bs

2 files changed, 190 insertions, 83 deletions

diff --git a/keyboards/noxary/valhalla/info.json b/keyboards/noxary/valhalla/info.json
index 8f5063c7c8..165a4155a9 100644
--- a/keyboards/noxary/valhalla/info.json
+++ b/keyboards/noxary/valhalla/info.json
@@ -18,89 +18,175 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-
-                {"matrix": [0, 7], "x": 9, "y": 0},
-                {"matrix": [0, 8], "x": 10, "y": 0},
-                {"matrix": [0, 9], "x": 11, "y": 0},
-                {"matrix": [0, 10], "x": 12, "y": 0},
-                {"matrix": [0, 11], "x": 13, "y": 0},
-                {"matrix": [0, 12], "x": 14, "y": 0},
-                {"matrix": [0, 13], "x": 15, "y": 0},
-                {"matrix": [0, 14], "x": 16, "y": 0},
-                {"matrix": [2, 14], "x": 17, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-
-                {"matrix": [1, 6], "x": 8.5, "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, "w": 1.5},
-                {"matrix": [1, 14], "x": 17, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-
-                {"matrix": [2, 6], "x": 8.75, "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, "w": 2.25},
-                {"matrix": [2, 13], "x": 17, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-
-                {"matrix": [3, 6], "x": 8.25, "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, "w": 1.75},
-                {"matrix": [3, 13], "x": 16, "y": 3},
-                {"matrix": [3, 14], "x": 17, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
-                {"matrix": [4, 4], "x": 5.75, "y": 4},
-
-                {"matrix": [4, 5], "x": 8, "y": 4},
-                {"matrix": [4, 6], "x": 9, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 10.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 11.75, "y": 4},
-                {"matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5},
-
-                {"matrix": [4, 12], "x": 15, "y": 4},
-                {"matrix": [4, 13], "x": 16, "y": 4},
-                {"matrix": [4, 14], "x": 17, "y": 4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+
+                {"label": "7", "matrix": [0, 7], "x": 9, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 15, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 16, "y": 0},
+                {"label": "Delete", "matrix": [2, 14], "x": 17, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"label": "Y", "matrix": [1, 6], "x": 8.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 12.5, "y": 1},
+                {"label": "[", "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, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 17, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"label": "H", "matrix": [2, 6], "x": 8.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 13], "x": 17, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"label": "B", "matrix": [3, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.25, "y": 3},
+                {"label": ",", "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": "Shift", "matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"label": "Space", "matrix": [4, 5], "x": 8, "y": 4},
+                {"label": "Space", "matrix": [4, 6], "x": 9, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 7], "x": 10.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 8], "x": 11.75, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 15, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 16, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 17, "y": 4}
+            ]
+        },
+        "LAYOUT_2u_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+
+                {"label": "7", "matrix": [0, 7], "x": 9, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+                {"label": "Delete", "matrix": [2, 14], "x": 17, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"label": "Y", "matrix": [1, 6], "x": 8.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 9.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 10.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 11.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 12.5, "y": 1},
+                {"label": "[", "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, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 17, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"label": "H", "matrix": [2, 6], "x": 8.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 9.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 10.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 11.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 12.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 13.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 13], "x": 17, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"label": "B", "matrix": [3, 6], "x": 8.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.25, "y": 3},
+                {"label": ",", "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": "Shift", "matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 4], "x": 5.75, "y": 4},
+
+                {"label": "Space", "matrix": [4, 5], "x": 8, "y": 4},
+                {"label": "Space", "matrix": [4, 6], "x": 9, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 7], "x": 10.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 8], "x": 11.75, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [4, 12], "x": 15, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 16, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 17, "y": 4}
             ]
         }
     }
diff --git a/keyboards/noxary/valhalla/matrix_diagram.md b/keyboards/noxary/valhalla/matrix_diagram.md
new file mode 100644
index 0000000000..74d3206a00
--- /dev/null
+++ b/keyboards/noxary/valhalla/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Noxary Valhalla
+
+```
+                                                            ┌───────┐
+                                               2u Backspace │0D     │
+                                                            └───────┘
+┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │       │07 │08 │09 │0A │0B │0C │0D │0E │2E │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│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      │2D │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│30      │31 │32 │33 │34 │35 │   │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├─────┬──┴┬──┴──┬┴───┴─┬─┴─┬─┘  ┌┴──┬┴───┼───┴─┬─┴─┬─┴───┼──┬───┼───┼───┤
+│40   │41 │42   │43    │44 │    │45 │46  │47   │48 │49   │  │4C │4D │4E │
+└─────┴───┴─────┴──────┴───┘    └───┴────┴─────┴───┴─────┘  └───┴───┴───┘
+          2.75u ┌──────────┐    ┌────────┐ 2.25u
+     Left Space │44        │    │46      │ Right Space
+                └──────────┘    └────────┘
+```