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

5 files changed, 153 insertions, 397 deletions

diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json
index 013b56764f..940df081c9 100644
--- a/keyboards/rgbkb/zen/rev1/info.json
+++ b/keyboards/rgbkb/zen/rev1/info.json
@@ -23,7 +23,79 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "y":0}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0.5, "y": 0},
+        {"matrix": [0, 1], "x": 1.5, "y": 0},
+        {"matrix": [0, 2], "x": 2.5, "y": 0},
+        {"matrix": [0, 3], "x": 3.5, "y": 0},
+        {"matrix": [0, 4], "x": 4.5, "y": 0},
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+        {"matrix": [5, 5], "x": 10.5, "y": 0},
+        {"matrix": [5, 4], "x": 11.5, "y": 0},
+        {"matrix": [5, 3], "x": 12.5, "y": 0},
+        {"matrix": [5, 2], "x": 13.5, "y": 0},
+        {"matrix": [5, 1], "x": 14.5, "y": 0},
+        {"matrix": [5, 0], "x": 15.5, "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": [6, 5], "x": 10.5, "y": 1},
+        {"matrix": [6, 4], "x": 11.5, "y": 1},
+        {"matrix": [6, 3], "x": 12.5, "y": 1},
+        {"matrix": [6, 2], "x": 13.5, "y": 1},
+        {"matrix": [6, 1], "x": 14.5, "y": 1},
+        {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [7, 5], "x": 10.5, "y": 2},
+        {"matrix": [7, 4], "x": 11.5, "y": 2},
+        {"matrix": [7, 3], "x": 12.5, "y": 2},
+        {"matrix": [7, 2], "x": 13.5, "y": 2},
+        {"matrix": [7, 1], "x": 14.5, "y": 2},
+        {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 3},
+        {"matrix": [3, 2], "x": 2.5, "y": 3},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3},
+        {"matrix": [3, 5], "x": 5.5, "y": 3},
+
+        {"matrix": [8, 5], "x": 10.5, "y": 3},
+        {"matrix": [8, 4], "x": 11.5, "y": 3},
+        {"matrix": [8, 3], "x": 12.5, "y": 3},
+        {"matrix": [8, 2], "x": 13.5, "y": 3},
+        {"matrix": [8, 1], "x": 14.5, "y": 3},
+        {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+        {"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},
+        {"matrix": [4, 3], "x": 3.5, "y": 4},
+        {"matrix": [4, 4], "x": 4.5, "y": 4},
+        {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2},
+        {"matrix": [4, 6], "x": 7, "y": 4.5, "h": 2},
+
+        {"matrix": [9, 6], "x": 9, "y": 4.5, "h": 2},
+        {"matrix": [9, 5], "x": 10, "y": 4.5, "h": 2},
+        {"matrix": [9, 4], "x": 11.5, "y": 4},
+        {"matrix": [9, 3], "x": 12.5, "y": 4},
+        {"matrix": [9, 2], "x": 13.5, "y": 4},
+        {"matrix": [9, 1], "x": 14.5, "y": 4},
+        {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5}
+      ]
     }
   }
 }
diff --git a/keyboards/rgbkb/zen/rev1/rev1.h b/keyboards/rgbkb/zen/rev1/rev1.h
deleted file mode 100644
index 3b437c459c..0000000000
--- a/keyboards/rgbkb/zen/rev1/rev1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,               k55, k54, k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15,               k65, k64, k63, k62, k61, k60, \
-    k20, k21, k22, k23, k24, k25,               k75, k74, k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35,               k85, k84, k83, k82, k81, k80, \
-    k40, k41, k42, k43, k44, k45, k46,   k96,   k95, k94, k93, k92, k91, k90 \
-    ) \
-    { \
-        { k00, k01, k02, k03, k04, k05, KC_NO }, \
-        { k10, k11, k12, k13, k14, k15, KC_NO }, \
-        { k20, k21, k22, k23, k24, k25, KC_NO }, \
-        { k30, k31, k32, k33, k34, k35, KC_NO }, \
-        { k40, k41, k42, k43, k44, k45, k46 }, \
-        { k50, k51, k52, k53, k54, k55, KC_NO }, \
-        { k60, k61, k62, k63, k64, k65, KC_NO }, \
-        { k70, k71, k72, k73, k74, k75, KC_NO }, \
-        { k80, k81, k82, k83, k84, k85, KC_NO }, \
-        { k90, k91, k92, k93, k94, k95, k96 } \
-    }
diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json
index ef91fd30d1..eed39e5628 100644
--- a/keyboards/rgbkb/zen/rev2/info.json
+++ b/keyboards/rgbkb/zen/rev2/info.json
@@ -29,354 +29,85 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {
-            "label": "k00",
-            "x": 0.5,
-            "y": 0
-          },
-          {
-            "label": "k01",
-            "x": 1.5,
-            "y": 0
-          },
-          {
-            "label": "k02",
-            "x": 2.5,
-            "y": 0
-          },
-          {
-            "label": "k03",
-            "x": 3.5,
-            "y": 0
-          },
-          {
-            "label": "k04",
-            "x": 4.5,
-            "y": 0
-          },
-          {
-            "label": "k05",
-            "x": 5.5,
-            "y": 0
-          },
-          {
-            "label": "k55",
-            "x": 10.5,
-            "y": 0
-          },
-          {
-            "label": "k54",
-            "x": 11.5,
-            "y": 0
-          },
-          {
-            "label": "k53",
-            "x": 12.5,
-            "y": 0
-          },
-          {
-            "label": "k52",
-            "x": 13.5,
-            "y": 0
-          },
-          {
-            "label": "k51",
-            "x": 14.5,
-            "y": 0
-          },
-          {
-            "label": "k50",
-            "x": 15.5,
-            "y": 0
-          },
-          {
-            "label": "k10",
-            "x": 0,
-            "y": 1,
-            "w": 1.5
-          },
-          {
-            "label": "k11",
-            "x": 1.5,
-            "y": 1
-          },
-          {
-            "label": "k12",
-            "x": 2.5,
-            "y": 1
-          },
-          {
-            "label": "k13",
-            "x": 3.5,
-            "y": 1
-          },
-          {
-            "label": "k14",
-            "x": 4.5,
-            "y": 1
-          },
-          {
-            "label": "k15",
-            "x": 5.5,
-            "y": 1
-          },
-          {
-            "label": "k65",
-            "x": 10.5,
-            "y": 1
-          },
-          {
-            "label": "k64",
-            "x": 11.5,
-            "y": 1
-          },
-          {
-            "label": "k63",
-            "x": 12.5,
-            "y": 1
-          },
-          {
-            "label": "k62",
-            "x": 13.5,
-            "y": 1
-          },
-          {
-            "label": "k61",
-            "x": 14.5,
-            "y": 1
-          },
-          {
-            "label": "k60",
-            "x": 15.5,
-            "y": 1,
-            "w": 1.5
-          },
-          {
-            "label": "k20",
-            "x": 0,
-            "y": 2,
-            "w": 1.5
-          },
-          {
-            "label": "k21",
-            "x": 1.5,
-            "y": 2
-          },
-          {
-            "label": "k22",
-            "x": 2.5,
-            "y": 2
-          },
-          {
-            "label": "k23",
-            "x": 3.5,
-            "y": 2
-          },
-          {
-            "label": "k24",
-            "x": 4.5,
-            "y": 2
-          },
-          {
-            "label": "k25",
-            "x": 5.5,
-            "y": 2
-          },
-          {
-            "label": "k75",
-            "x": 10.5,
-            "y": 2
-          },
-          {
-            "label": "k74",
-            "x": 11.5,
-            "y": 2
-          },
-          {
-            "label": "k73",
-            "x": 12.5,
-            "y": 2
-          },
-          {
-            "label": "k72",
-            "x": 13.5,
-            "y": 2
-          },
-          {
-            "label": "k71",
-            "x": 14.5,
-            "y": 2
-          },
-          {
-            "label": "k70",
-            "x": 15.5,
-            "y": 2,
-            "w": 1.5
-          },
-          {
-            "label": "k30",
-            "x": 0,
-            "y": 3,
-            "w": 1.5
-          },
-          {
-            "label": "k31",
-            "x": 1.5,
-            "y": 3
-          },
-          {
-            "label": "k32",
-            "x": 2.5,
-            "y": 3
-          },
-          {
-            "label": "k33",
-            "x": 3.5,
-            "y": 3
-          },
-          {
-            "label": "k34",
-            "x": 4.5,
-            "y": 3
-          },
-          {
-            "label": "k35",
-            "x": 5.5,
-            "y": 3
-          },
-          {
-            "label": "k16",
-            "x": 6.5,
-            "y": 3
-          },
-          {
-            "label": "k66",
-            "x": 9.5,
-            "y": 3
-          },
-          {
-            "label": "k85",
-            "x": 10.5,
-            "y": 3
-          },
-          {
-            "label": "k84",
-            "x": 11.5,
-            "y": 3
-          },
-          {
-            "label": "k83",
-            "x": 12.5,
-            "y": 3
-          },
-          {
-            "label": "k82",
-            "x": 13.5,
-            "y": 3
-          },
-          {
-            "label": "k81",
-            "x": 14.5,
-            "y": 3
-          },
-          {
-            "label": "k80",
-            "x": 15.5,
-            "y": 3,
-            "w": 1.5
-          },
-          {
-            "label": "k40",
-            "x": 0,
-            "y": 4,
-            "w": 1.5
-          },
-          {
-            "label": "k41",
-            "x": 1.5,
-            "y": 4
-          },
-          {
-            "label": "k42",
-            "x": 2.5,
-            "y": 4
-          },
-          {
-            "label": "k43",
-            "x": 3.5,
-            "y": 4
-          },
-          {
-            "label": "k44",
-            "x": 4.5,
-            "y": 4
-          },
-          {
-            "label": "k36",
-            "x": 6,
-            "y": 4.5
-          },
-          {
-            "label": "k26",
-            "x": 7,
-            "y": 4.5
-          },
-          {
-            "label": "k76",
-            "x": 9,
-            "y": 4.5
-          },
-          {
-            "label": "k86",
-            "x": 10,
-            "y": 4.5
-          },
-          {
-            "label": "k94",
-            "x": 11.5,
-            "y": 4
-          },
-          {
-            "label": "k93",
-            "x": 12.5,
-            "y": 4
-          },
-          {
-            "label": "k92",
-            "x": 13.5,
-            "y": 4
-          },
-          {
-            "label": "k91",
-            "x": 14.5,
-            "y": 4
-          },
-          {
-            "label": "k90",
-            "x": 15.5,
-            "y": 4,
-            "w": 1.5
-          },
-          {
-            "label": "k45",
-            "x": 6,
-            "y": 5.5
-          },
-          {
-            "label": "k46",
-            "x": 7,
-            "y": 5.5
-          },
-          {
-            "label": "k96",
-            "x": 9,
-            "y": 5.5
-          },
-          {
-            "label": "k95",
-            "x": 10,
-            "y": 5.5
-          }
+          {"matrix": [0, 0], "x": 0.5, "y": 0},
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+          {"matrix": [0, 3], "x": 3.5, "y": 0},
+          {"matrix": [0, 4], "x": 4.5, "y": 0},
+          {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+          {"matrix": [5, 5], "x": 10.5, "y": 0},
+          {"matrix": [5, 4], "x": 11.5, "y": 0},
+          {"matrix": [5, 3], "x": 12.5, "y": 0},
+          {"matrix": [5, 2], "x": 13.5, "y": 0},
+          {"matrix": [5, 1], "x": 14.5, "y": 0},
+          {"matrix": [5, 0], "x": 15.5, "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": [6, 5], "x": 10.5, "y": 1},
+          {"matrix": [6, 4], "x": 11.5, "y": 1},
+          {"matrix": [6, 3], "x": 12.5, "y": 1},
+          {"matrix": [6, 2], "x": 13.5, "y": 1},
+          {"matrix": [6, 1], "x": 14.5, "y": 1},
+          {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+          {"matrix": [2, 1], "x": 1.5, "y": 2},
+          {"matrix": [2, 2], "x": 2.5, "y": 2},
+          {"matrix": [2, 3], "x": 3.5, "y": 2},
+          {"matrix": [2, 4], "x": 4.5, "y": 2},
+          {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+          {"matrix": [7, 5], "x": 10.5, "y": 2},
+          {"matrix": [7, 4], "x": 11.5, "y": 2},
+          {"matrix": [7, 3], "x": 12.5, "y": 2},
+          {"matrix": [7, 2], "x": 13.5, "y": 2},
+          {"matrix": [7, 1], "x": 14.5, "y": 2},
+          {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3},
+          {"matrix": [3, 2], "x": 2.5, "y": 3},
+          {"matrix": [3, 3], "x": 3.5, "y": 3},
+          {"matrix": [3, 4], "x": 4.5, "y": 3},
+          {"matrix": [3, 5], "x": 5.5, "y": 3},
+          {"matrix": [1, 6], "x": 6.5, "y": 3},
+
+          {"matrix": [6, 6], "x": 9.5, "y": 3},
+          {"matrix": [8, 5], "x": 10.5, "y": 3},
+          {"matrix": [8, 4], "x": 11.5, "y": 3},
+          {"matrix": [8, 3], "x": 12.5, "y": 3},
+          {"matrix": [8, 2], "x": 13.5, "y": 3},
+          {"matrix": [8, 1], "x": 14.5, "y": 3},
+          {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+          {"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},
+          {"matrix": [4, 3], "x": 3.5, "y": 4},
+          {"matrix": [4, 4], "x": 4.5, "y": 4},
+
+          {"matrix": [3, 6], "x": 6, "y": 4.5},
+          {"matrix": [2, 6], "x": 7, "y": 4.5},
+          {"matrix": [7, 6], "x": 9, "y": 4.5},
+          {"matrix": [8, 6], "x": 10, "y": 4.5},
+
+          {"matrix": [9, 4], "x": 11.5, "y": 4},
+          {"matrix": [9, 3], "x": 12.5, "y": 4},
+          {"matrix": [9, 2], "x": 13.5, "y": 4},
+          {"matrix": [9, 1], "x": 14.5, "y": 4},
+          {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+          {"matrix": [4, 5], "x": 6, "y": 5.5},
+          {"matrix": [4, 6], "x": 7, "y": 5.5},
+          {"matrix": [9, 6], "x": 9, "y": 5.5},
+          {"matrix": [9, 5], "x": 10, "y": 5.5}
         ]
       }
     }
diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c
index 70e5531673..4c308264d6 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.c
+++ b/keyboards/rgbkb/zen/rev2/rev2.c
@@ -1,4 +1,4 @@
-#include "rev2.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 #include "split_util.h"
diff --git a/keyboards/rgbkb/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h
deleted file mode 100644
index c7a06d1767..0000000000
--- a/keyboards/rgbkb/zen/rev2/rev2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \
-    k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \
-    k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \
-                             k45, k46,   k96, k95 \
-    ) \
-    { \
-        { k00, k01, k02, k03, k04, k05, KC_NO }, \
-        { k10, k11, k12, k13, k14, k15, k16 }, \
-        { k20, k21, k22, k23, k24, k25, k26 }, \
-        { k30, k31, k32, k33, k34, k35, k36 }, \
-        { k40, k41, k42, k43, k44, k45, k46 }, \
-        { k50, k51, k52, k53, k54, k55, KC_NO }, \
-        { k60, k61, k62, k63, k64, k65, k66 }, \
-        { k70, k71, k72, k73, k74, k75, k76 }, \
-        { k80, k81, k82, k83, k84, k85, k86 }, \
-        { k90, k91, k92, k93, k94, k95, k96 } \
-    }