Move single `LAYOUT`s to data driven (#20365)

1 files changed, 61 insertions, 52 deletions

diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json
index a5d7b8855b..39d6c11eb2 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/info.json
+++ b/keyboards/glenpickle/chimera_ortho_plus/info.json
@@ -12,58 +12,67 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label": "{", "x": 0, "y": 0},
-        {"label": "1", "x": 1, "y": 0},
-        {"label": "2", "x": 2, "y": 0},
-        {"label": "3", "x": 3, "y": 0},
-        {"label": "4", "x": 4, "y": 0},
-        {"label": "5", "x": 5, "y": 0},
-        {"label": "6", "x": 7.5, "y": 0},
-        {"label": "7", "x": 8.5, "y": 0},
-        {"label": "8", "x": 9.5, "y": 0},
-        {"label": "9", "x": 10.5, "y": 0},
-        {"label": "0", "x": 11.5, "y": 0},
-        {"label": "}", "x": 12.5, "y": 0},
-        {"label": "Esc", "x": 0, "y": 1},
-        {"label": "Q", "x": 1, "y": 1},
-        {"label": "W", "x": 2, "y": 1},
-        {"label": "E", "x": 3, "y": 1},
-        {"label": "R", "x": 4, "y": 1},
-        {"label": "T", "x": 5, "y": 1},
-        {"label": "Y", "x": 7.5, "y": 1},
-        {"label": "U", "x": 8.5, "y": 1},
-        {"label": "I", "x": 9.5, "y": 1},
-        {"label": "O", "x": 10.5, "y": 1},
-        {"label": "P", "x": 11.5, "y": 1},
-        {"label": "\"", "x": 12.5, "y": 1},
-        {"label": "Tab", "x": 0, "y": 2},
-        {"label": "A", "x": 1, "y": 2},
-        {"label": "S", "x": 2, "y": 2},
-        {"label": "D", "x": 3, "y": 2},
-        {"label": "F", "x": 4, "y": 2},
-        {"label": "G", "x": 5, "y": 2},
-        {"label": "H", "x": 7.5, "y": 2},
-        {"label": "J", "x": 8.5, "y": 2},
-        {"label": "K", "x": 9.5, "y": 2},
-        {"label": "L", "x": 10.5, "y": 2},
-        {"label": ";", "x": 11.5, "y": 2},
-        {"label": "Enter", "x": 12.5, "y": 2},
-        {"label": "(", "x": 0, "y": 3},
-        {"label": "Z", "x": 1, "y": 3},
-        {"label": "X", "x": 2, "y": 3},
-        {"label": "C", "x": 3, "y": 3},
-        {"label": "V", "x": 4, "y": 3},
-        {"label": "B", "x": 5, "y": 3},
-        {"label": "N", "x": 7.5, "y": 3},
-        {"label": "M", "x": 8.5, "y": 3},
-        {"label": ",", "x": 9.5, "y": 3},
-        {"label": ".", "x": 10.5, "y": 3},
-        {"label": "/", "x": 11.5, "y": 3},
-        {"label": ")", "x": 12.5, "y": 3},
-        {"label": "Num Layer", "x": 4, "y": 4},
-        {"label": "Back Space", "x": 5, "y": 4},
-        {"label": "Space", "x": 7.5, "y": 4},
-        {"label": "Symbol Layer", "x": 8.5, "y": 4}
+        {"matrix": [1, 0], "x": 0, "y": 0},
+        {"matrix": [0, 5], "x": 1, "y": 0},
+        {"matrix": [2, 2], "x": 2, "y": 0},
+        {"matrix": [0, 0], "x": 3, "y": 0},
+        {"matrix": [3, 3], "x": 4, "y": 0},
+        {"matrix": [3, 4], "x": 5, "y": 0},
+
+        {"matrix": [3, 7], "x": 7.5, "y": 0},
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 10], "x": 9.5, "y": 0},
+        {"matrix": [2, 9], "x": 10.5, "y": 0},
+        {"matrix": [0, 11], "x": 11.5, "y": 0},
+        {"matrix": [1, 11], "x": 12.5, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1},
+        {"matrix": [3, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [0, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [2, 4], "x": 5, "y": 1},
+
+        {"matrix": [2, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 7], "x": 8.5, "y": 1},
+        {"matrix": [0, 8], "x": 9.5, "y": 1},
+        {"matrix": [1, 9], "x": 10.5, "y": 1},
+        {"matrix": [3, 10], "x": 11.5, "y": 1},
+        {"matrix": [2, 11], "x": 12.5, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [0, 2], "x": 2, "y": 2},
+        {"matrix": [1, 3], "x": 3, "y": 2},
+        {"matrix": [0, 4], "x": 4, "y": 2},
+        {"matrix": [4, 0], "x": 5, "y": 2},
+
+        {"matrix": [4, 6], "x": 7.5, "y": 2},
+        {"matrix": [0, 7], "x": 8.5, "y": 2},
+        {"matrix": [1, 8], "x": 9.5, "y": 2},
+        {"matrix": [0, 9], "x": 10.5, "y": 2},
+        {"matrix": [2, 10], "x": 11.5, "y": 2},
+        {"matrix": [3, 11], "x": 12.5, "y": 2},
+
+        {"matrix": [1, 5], "x": 0, "y": 3},
+        {"matrix": [1, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [2, 3], "x": 3, "y": 3},
+        {"matrix": [0, 1], "x": 4, "y": 3},
+        {"matrix": [4, 1], "x": 5, "y": 3},
+
+        {"matrix": [0, 6], "x": 7.5, "y": 3},
+        {"matrix": [4, 7], "x": 8.5, "y": 3},
+        {"matrix": [2, 8], "x": 9.5, "y": 3},
+        {"matrix": [3, 9], "x": 10.5, "y": 3},
+        {"matrix": [1, 10], "x": 11.5, "y": 3},
+        {"matrix": [1, 6], "x": 12.5, "y": 3},
+
+        {"matrix": [3, 5], "x": 4, "y": 4},
+        {"matrix": [2, 5], "x": 5, "y": 4},
+
+        {"matrix": [2, 6], "x": 7.5, "y": 4},
+        {"matrix": [3, 6], "x": 8.5, "y": 4}
       ]
     }
   }