Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

1 files changed, 129 insertions, 119 deletions

diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json
index 6b88be27d1..fda913aa32 100644
--- a/keyboards/ortho5by12/info.json
+++ b/keyboards/ortho5by12/info.json
@@ -21,128 +21,138 @@
   "layouts": {
     "LAYOUT_ortho_5x12_1x2uC": {
       "layout": [ 
-        { "x": 0, "y": 0 }, 
-        { "x": 1, "y": 0 }, 
-        { "x": 2, "y": 0 }, 
-        { "x": 3, "y": 0 }, 
-        { "x": 4, "y": 0 }, 
-        { "x": 5, "y": 0 }, 
-        { "x": 6, "y": 0 }, 
-        { "x": 7, "y": 0 }, 
-        { "x": 8, "y": 0 }, 
-        { "x": 9, "y": 0 }, 
-        { "x": 10, "y": 0 }, 
-        { "x": 11, "y": 0 }, 
-        { "x": 0, "y": 1 }, 
-        { "x": 1, "y": 1 }, 
-        { "x": 2, "y": 1 }, 
-        { "x": 3, "y": 1 }, 
-        { "x": 4, "y": 1 }, 
-        { "x": 5, "y": 1 }, 
-        { "x": 6, "y": 1 }, 
-        { "x": 7, "y": 1 }, 
-        { "x": 8, "y": 1 }, 
-        { "x": 9, "y": 1 }, 
-        { "x": 10, "y": 1 }, 
-        { "x": 11, "y": 1 }, 
-        { "x": 0, "y": 2 }, 
-        { "x": 1, "y": 2 }, 
-        { "x": 2, "y": 2 }, 
-        { "x": 3, "y": 2 }, 
-        { "x": 4, "y": 2 }, 
-        { "x": 5, "y": 2 }, 
-        { "x": 6, "y": 2 }, 
-        { "x": 7, "y": 2 }, 
-        { "x": 8, "y": 2 }, 
-        { "x": 9, "y": 2 }, 
-        { "x": 10, "y": 2 }, 
-        { "x": 11, "y": 2 }, 
-        { "x": 0, "y": 3 }, 
-        { "x": 1, "y": 3 }, 
-        { "x": 2, "y": 3 }, 
-        { "x": 3, "y": 3 }, 
-        { "x": 4, "y": 3 }, 
-        { "x": 5, "y": 3 }, 
-        { "x": 6, "y": 3 }, 
-        { "x": 7, "y": 3 }, 
-        { "x": 8, "y": 3 }, 
-        { "x": 9, "y": 3 }, 
-        { "x": 10, "y": 3 }, 
-        { "x": 11, "y": 3 }, 
-        { "x": 0, "y": 4 }, 
-        { "x": 1, "y": 4 }, 
-        { "x": 2, "y": 4 }, 
-        { "x": 3, "y": 4 }, 
-        { "x": 4, "y": 4 }, 
-        { "w": 2, "x": 5, "y": 4 }, 
-        { "x": 7, "y": 4 }, 
-        { "x": 8, "y": 4 }, 
-        { "x": 9, "y": 4 }, 
-        { "x": 10, "y": 4 }, 
-        { "x": 11, "y": 4 } ]
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [1, 1], "x": 2, "y": 0},
+        {"matrix": [0, 1], "x": 3, "y": 0},
+        {"matrix": [1, 2], "x": 4, "y": 0},
+        {"matrix": [0, 2], "x": 5, "y": 0},
+        {"matrix": [1, 3], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [1, 4], "x": 8, "y": 0},
+        {"matrix": [0, 4], "x": 9, "y": 0},
+        {"matrix": [1, 5], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 0], "x": 1, "y": 1},
+        {"matrix": [2, 1], "x": 2, "y": 1},
+        {"matrix": [3, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [3, 2], "x": 5, "y": 1},
+        {"matrix": [2, 3], "x": 6, "y": 1},
+        {"matrix": [3, 3], "x": 7, "y": 1},
+        {"matrix": [2, 4], "x": 8, "y": 1},
+        {"matrix": [3, 4], "x": 9, "y": 1},
+        {"matrix": [2, 5], "x": 10, "y": 1},
+        {"matrix": [3, 5], "x": 11, "y": 1},
+
+        {"matrix": [5, 0], "x": 0, "y": 2},
+        {"matrix": [4, 0], "x": 1, "y": 2},
+        {"matrix": [5, 1], "x": 2, "y": 2},
+        {"matrix": [4, 1], "x": 3, "y": 2},
+        {"matrix": [5, 2], "x": 4, "y": 2},
+        {"matrix": [4, 2], "x": 5, "y": 2},
+        {"matrix": [5, 3], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [5, 4], "x": 8, "y": 2},
+        {"matrix": [4, 4], "x": 9, "y": 2},
+        {"matrix": [5, 5], "x": 10, "y": 2},
+        {"matrix": [4, 5], "x": 11, "y": 2},
+
+        {"matrix": [6, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [6, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [6, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [6, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [6, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [6, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+
+        {"matrix": [9, 0], "x": 0, "y": 4},
+        {"matrix": [8, 0], "x": 1, "y": 4},
+        {"matrix": [9, 1], "x": 2, "y": 4},
+        {"matrix": [8, 1], "x": 3, "y": 4},
+        {"matrix": [9, 2], "x": 4, "y": 4},
+        {"matrix": [8, 2], "x": 5, "y": 4, "w": 2},
+        {"matrix": [8, 3], "x": 7, "y": 4},
+        {"matrix": [9, 4], "x": 8, "y": 4},
+        {"matrix": [8, 4], "x": 9, "y": 4},
+        {"matrix": [9, 5], "x": 10, "y": 4},
+        {"matrix": [8, 5], "x": 11, "y": 4}
+      ]
     },
     "LAYOUT_ortho_5x12": {
       "layout": [ 
-        { "x": 0, "y": 0 }, 
-        { "x": 1, "y": 0 }, 
-        { "x": 2, "y": 0 }, 
-        { "x": 3, "y": 0 }, 
-        { "x": 4, "y": 0 }, 
-        { "x": 5, "y": 0 }, 
-        { "x": 6, "y": 0 }, 
-        { "x": 7, "y": 0 }, 
-        { "x": 8, "y": 0 }, 
-        { "x": 9, "y": 0 }, 
-        { "x": 10, "y": 0 }, 
-        { "x": 11, "y": 0 }, 
-        { "x": 0, "y": 1 }, 
-        { "x": 1, "y": 1 }, 
-        { "x": 2, "y": 1 }, 
-        { "x": 3, "y": 1 }, 
-        { "x": 4, "y": 1 }, 
-        { "x": 5, "y": 1 }, 
-        { "x": 6, "y": 1 }, 
-        { "x": 7, "y": 1 }, 
-        { "x": 8, "y": 1 }, 
-        { "x": 9, "y": 1 }, 
-        { "x": 10, "y": 1 }, 
-        { "x": 11, "y": 1 }, 
-        { "x": 0, "y": 2 }, 
-        { "x": 1, "y": 2 }, 
-        { "x": 2, "y": 2 }, 
-        { "x": 3, "y": 2 }, 
-        { "x": 4, "y": 2 }, 
-        { "x": 5, "y": 2 }, 
-        { "x": 6, "y": 2 }, 
-        { "x": 7, "y": 2 }, 
-        { "x": 8, "y": 2 }, 
-        { "x": 9, "y": 2 }, 
-        { "x": 10, "y": 2 }, 
-        { "x": 11, "y": 2 }, 
-        { "x": 0, "y": 3 }, 
-        { "x": 1, "y": 3 }, 
-        { "x": 2, "y": 3 }, 
-        { "x": 3, "y": 3 }, 
-        { "x": 4, "y": 3 }, 
-        { "x": 5, "y": 3 }, 
-        { "x": 6, "y": 3 }, 
-        { "x": 7, "y": 3 }, 
-        { "x": 8, "y": 3 }, 
-        { "x": 9, "y": 3 }, 
-        { "x": 10, "y": 3 }, 
-        { "x": 11, "y": 3 },
-        { "x": 0, "y": 4 }, 
-        { "x": 1, "y": 4 }, 
-        { "x": 2, "y": 4 }, 
-        { "x": 3, "y": 4 }, 
-        { "x": 4, "y": 4 }, 
-        { "x": 5, "y": 4 }, 
-        { "x": 6, "y": 4 }, 
-        { "x": 7, "y": 4 }, 
-        { "x": 8, "y": 4 }, 
-        { "x": 9, "y": 4 }, 
-        { "x": 10, "y": 4 }, 
-        { "x": 11, "y": 4 } ]
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [1, 1], "x": 2, "y": 0},
+        {"matrix": [0, 1], "x": 3, "y": 0},
+        {"matrix": [1, 2], "x": 4, "y": 0},
+        {"matrix": [0, 2], "x": 5, "y": 0},
+        {"matrix": [1, 3], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [1, 4], "x": 8, "y": 0},
+        {"matrix": [0, 4], "x": 9, "y": 0},
+        {"matrix": [1, 5], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 0], "x": 1, "y": 1},
+        {"matrix": [2, 1], "x": 2, "y": 1},
+        {"matrix": [3, 1], "x": 3, "y": 1},
+        {"matrix": [2, 2], "x": 4, "y": 1},
+        {"matrix": [3, 2], "x": 5, "y": 1},
+        {"matrix": [2, 3], "x": 6, "y": 1},
+        {"matrix": [3, 3], "x": 7, "y": 1},
+        {"matrix": [2, 4], "x": 8, "y": 1},
+        {"matrix": [3, 4], "x": 9, "y": 1},
+        {"matrix": [2, 5], "x": 10, "y": 1},
+        {"matrix": [3, 5], "x": 11, "y": 1},
+
+        {"matrix": [5, 0], "x": 0, "y": 2},
+        {"matrix": [4, 0], "x": 1, "y": 2},
+        {"matrix": [5, 1], "x": 2, "y": 2},
+        {"matrix": [4, 1], "x": 3, "y": 2},
+        {"matrix": [5, 2], "x": 4, "y": 2},
+        {"matrix": [4, 2], "x": 5, "y": 2},
+        {"matrix": [5, 3], "x": 6, "y": 2},
+        {"matrix": [4, 3], "x": 7, "y": 2},
+        {"matrix": [5, 4], "x": 8, "y": 2},
+        {"matrix": [4, 4], "x": 9, "y": 2},
+        {"matrix": [5, 5], "x": 10, "y": 2},
+        {"matrix": [4, 5], "x": 11, "y": 2},
+
+        {"matrix": [6, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [6, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [6, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+        {"matrix": [6, 3], "x": 6, "y": 3},
+        {"matrix": [7, 3], "x": 7, "y": 3},
+        {"matrix": [6, 4], "x": 8, "y": 3},
+        {"matrix": [7, 4], "x": 9, "y": 3},
+        {"matrix": [6, 5], "x": 10, "y": 3},
+        {"matrix": [7, 5], "x": 11, "y": 3},
+
+        {"matrix": [9, 0], "x": 0, "y": 4},
+        {"matrix": [8, 0], "x": 1, "y": 4},
+        {"matrix": [9, 1], "x": 2, "y": 4},
+        {"matrix": [8, 1], "x": 3, "y": 4},
+        {"matrix": [9, 2], "x": 4, "y": 4},
+        {"matrix": [8, 2], "x": 5, "y": 4},
+        {"matrix": [9, 3], "x": 6, "y": 4},
+        {"matrix": [8, 3], "x": 7, "y": 4},
+        {"matrix": [9, 4], "x": 8, "y": 4},
+        {"matrix": [8, 4], "x": 9, "y": 4},
+        {"matrix": [9, 5], "x": 10, "y": 4},
+        {"matrix": [8, 5], "x": 11, "y": 4}
+      ]
     }
   }
 }