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

2 files changed, 52 insertions, 23 deletions

diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json
index 4250d9b8dc..b68b781fee 100644
--- a/keyboards/tg4x/info.json
+++ b/keyboards/tg4x/info.json
@@ -18,9 +18,59 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
-    "layouts": {
+   "layouts": {
         "LAYOUT": {
-            "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":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3, "w":1.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+            "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": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [5, 0], "x": 7.25, "y": 1},
+                {"matrix": [5, 1], "x": 8.25, "y": 1},
+                {"matrix": [5, 2], "x": 9.25, "y": 1},
+                {"matrix": [5, 3], "x": 10.25, "y": 1},
+                {"matrix": [5, 4], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [6, 0], "x": 7.75, "y": 2},
+                {"matrix": [6, 1], "x": 8.75, "y": 2},
+                {"matrix": [6, 2], "x": 9.75, "y": 2},
+                {"matrix": [6, 3], "x": 10.75, "y": 2},
+                {"matrix": [6, 4], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [7, 1], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 10, "y": 3},
+                {"matrix": [7, 3], "x": 11, "y": 3},
+                {"matrix": [7, 4], "x": 12, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/tg4x/tg4x.h b/keyboards/tg4x/tg4x.h
deleted file mode 100644
index 80dc40238f..0000000000
--- a/keyboards/tg4x/tg4x.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k16, k50, k51, k52, k53, k54,      \
-    k20, k21, k22, k23, k24, k25, k26, k60, k61, k62, k63, k64,      \
-    k30, k31, k32, k34, k35, k71, k72, k73, k74                      \
-){ \
-    { k00, k01, k02, k03, k04, k05, k06 },  \
-    { k10, k11, k12, k13, k14, k15, k16 },  \
-    { k20, k21, k22, k23, k24, k25, k26 },  \
-    { k30, k31, k32, ___, k34, k35, ___ },  \
-    { k40, k41, k42, k43, k44, k45, ___ },  \
-    { k50, k51, k52, k53, k54, ___, ___ },  \
-    { k60, k61, k62, k63, k64, ___, ___ },  \
-    { ___, k71, k72, k73, k74, ___, ___ }   \
-}