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

2 files changed, 53 insertions, 64 deletions

diff --git a/keyboards/glenpickle/chimera_ortho/chimera_ortho.h b/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
index 03384c9b28..04ef56503f 100644
--- a/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
+++ b/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
@@ -41,21 +41,3 @@
 #define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
 #define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
 */
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k43, k00, k01, k02, k03, k04, k31,      k38, k05, k06, k07, k08, k09, k46, \
-    k42, k10, k11, k12, k13, k14, k32,      k37, k15, k16, k17, k18, k19, k47, \
-    k41, k20, k21, k22, k23, k24, k33,      k36, k25, k26, k27, k28, k29, k48, \
-                        k44, k34,                k35, k45 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \
-}
diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json
index cf51575b3d..4932d2f5a5 100644
--- a/keyboards/glenpickle/chimera_ortho/info.json
+++ b/keyboards/glenpickle/chimera_ortho/info.json
@@ -12,52 +12,59 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label": "Esc", "x": 0, "y": 0},
-        {"label": "Q", "x": 1, "y": 0},
-        {"label": "W", "x": 2, "y": 0},
-        {"label": "E", "x": 3, "y": 0},
-        {"label": "R", "x": 4, "y": 0},
-        {"label": "T", "x": 5, "y": 0},
-        {"label": "{", "x": 6, "y": 0},
-        {"label": "}", "x": 8.5, "y": 0},
-        {"label": "Y", "x": 9.5, "y": 0},
-        {"label": "U", "x": 10.5, "y": 0},
-        {"label": "I", "x": 11.5, "y": 0},
-        {"label": "O", "x": 12.5, "y": 0},
-        {"label": "P", "x": 13.5, "y": 0},
-        {"label": "\"", "x": 14.5, "y": 0},
-        {"label": "Tab", "x": 0, "y": 1},
-        {"label": "A", "x": 1, "y": 1},
-        {"label": "S", "x": 2, "y": 1},
-        {"label": "D", "x": 3, "y": 1},
-        {"label": "F", "x": 4, "y": 1},
-        {"label": "G", "x": 5, "y": 1},
-        {"label": "-", "x": 6, "y": 1},
-        {"label": "1", "x": 8.5, "y": 1},
-        {"label": "H", "x": 9.5, "y": 1},
-        {"label": "J", "x": 10.5, "y": 1},
-        {"label": "K", "x": 11.5, "y": 1},
-        {"label": "L", "x": 12.5, "y": 1},
-        {"label": ";", "x": 13.5, "y": 1},
-        {"label": "Enter", "x": 14.5, "y": 1},
-        {"label": "(", "x": 0, "y": 2},
-        {"label": "Z", "x": 1, "y": 2},
-        {"label": "X", "x": 2, "y": 2},
-        {"label": "C", "x": 3, "y": 2},
-        {"label": "V", "x": 4, "y": 2},
-        {"label": "B", "x": 5, "y": 2},
-        {"label": "=", "x": 6, "y": 2},
-        {"label": "8", "x": 8.5, "y": 2},
-        {"label": "N", "x": 9.5, "y": 2},
-        {"label": "M", "x": 10.5, "y": 2},
-        {"label": ", ", "x": 11.5, "y": 2},
-        {"label": ".", "x": 12.5, "y": 2},
-        {"label": "/", "x": 13.5, "y": 2},
-        {"label": ")", "x": 14.5, "y": 2},
-        {"label": "Num Layer", "x": 4, "y": 3.25},
-        {"label": "Back Space", "x": 5, "y": 3.25},
-        {"label": "Space", "x": 9.5, "y": 3.25},
-        {"label": "Symbol Layer", "x": 10.5, "y": 3.25}
+        {"matrix": [4, 3], "x": 0, "y": 0},
+        {"matrix": [0, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+        {"matrix": [3, 1], "x": 6, "y": 0},
+
+        {"matrix": [3, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 5], "x": 9.5, "y": 0},
+        {"matrix": [0, 6], "x": 10.5, "y": 0},
+        {"matrix": [0, 7], "x": 11.5, "y": 0},
+        {"matrix": [0, 8], "x": 12.5, "y": 0},
+        {"matrix": [0, 9], "x": 13.5, "y": 0},
+        {"matrix": [4, 6], "x": 14.5, "y": 0},
+
+        {"matrix": [4, 2], "x": 0, "y": 1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [1, 2], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1},
+        {"matrix": [1, 4], "x": 5, "y": 1},
+        {"matrix": [3, 2], "x": 6, "y": 1},
+
+        {"matrix": [3, 7], "x": 8.5, "y": 1},
+        {"matrix": [1, 5], "x": 9.5, "y": 1},
+        {"matrix": [1, 6], "x": 10.5, "y": 1},
+        {"matrix": [1, 7], "x": 11.5, "y": 1},
+        {"matrix": [1, 8], "x": 12.5, "y": 1},
+        {"matrix": [1, 9], "x": 13.5, "y": 1},
+        {"matrix": [4, 7], "x": 14.5, "y": 1},
+
+        {"matrix": [4, 1], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
+        {"matrix": [3, 3], "x": 6, "y": 2},
+
+        {"matrix": [3, 6], "x": 8.5, "y": 2},
+        {"matrix": [2, 5], "x": 9.5, "y": 2},
+        {"matrix": [2, 6], "x": 10.5, "y": 2},
+        {"matrix": [2, 7], "x": 11.5, "y": 2},
+        {"matrix": [2, 8], "x": 12.5, "y": 2},
+        {"matrix": [2, 9], "x": 13.5, "y": 2},
+        {"matrix": [4, 8], "x": 14.5, "y": 2},
+
+        {"matrix": [4, 4], "x": 4, "y": 3.25},
+        {"matrix": [3, 4], "x": 5, "y": 3.25},
+
+        {"matrix": [3, 5], "x": 9.5, "y": 3.25},
+        {"matrix": [4, 5], "x": 10.5, "y": 3.25}
       ]
     }
   }