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

2 files changed, 47 insertions, 25 deletions

diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index 2eaca18e65..8e21be5d69 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -12,14 +12,53 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"sw1", "x":0, "y":0.37}, {"label":"sw2", "x":1, "y":0.37}, {"label":"sw3", "x":2, "y":0.12}, {"label":"sw4", "x":3, "y":0}, {"label":"sw5", "x":4, "y":0.12}, {"label":"sw6", "x":5, "y":0.25},
-                {"label":"sw6", "x":8 , "y":0.25}, {"label":"sw5", "x":9 , "y":0.12}, {"label":"sw4", "x":10, "y":0}, {"label":"sw3", "x":11, "y":0.12}, {"label":"sw2", "x":12, "y":0.37}, {"label":"sw1", "x":13, "y":0.37},
-                {"label":"sw7", "x":0, "y":1.37}, {"label":"sw8", "x":1, "y":1.37}, {"label":"sw9", "x":2, "y":1.12}, {"label":"sw10", "x":3, "y":1}, {"label":"sw11", "x":4, "y":1.12}, {"label":"sw12", "x":5, "y":1.25},
-                {"label":"sw12", "x":8, "y":1.25}, {"label":"sw11", "x":9, "y":1.12}, {"label":"sw10", "x":10, "y":1}, {"label":"sw9", "x":11, "y":1.12}, {"label":"sw8", "x":12, "y":1.37}, {"label":"sw7", "x":13, "y":1.37},
-                {"label":"sw13", "x":0, "y":2.37}, {"label":"sw14", "x":1, "y":2.37}, {"label":"sw15", "x":2, "y":2.12}, {"label":"sw16", "x":3, "y":2}, {"label":"sw17", "x":4, "y":2.12}, {"label":"sw18", "x":5, "y":2.25},
-                {"label":"sw18", "x":8, "y":2.25}, {"label":"sw17", "x":9, "y":2.12}, {"label":"sw16", "x":10, "y":2}, {"label":"sw15", "x":11, "y":2.12}, {"label":"sw14", "x":12, "y":2.37}, {"label":"sw13", "x":13, "y":2.37},
-                {"label":"sw19", "x":4.5, "y":3.5, "h":1.25}, {"label":"sw20", "x":5.5, "y":3.5, "h":1.25},
-                {"label":"sw20", "x":7.5, "y":3.5, "h":1.25}, {"label":"sw19", "x":8.5, "y":3.5, "h":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0.37},
+                {"matrix": [0, 1], "x": 1, "y": 0.37},
+                {"matrix": [0, 2], "x": 2, "y": 0.12},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.12},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [4, 5], "x": 8, "y": 0.25},
+                {"matrix": [4, 4], "x": 9, "y": 0.12},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0.12},
+                {"matrix": [4, 1], "x": 12, "y": 0.37},
+                {"matrix": [4, 0], "x": 13, "y": 0.37},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.37},
+                {"matrix": [1, 1], "x": 1, "y": 1.37},
+                {"matrix": [1, 2], "x": 2, "y": 1.12},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.12},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [5, 5], "x": 8, "y": 1.25},
+                {"matrix": [5, 4], "x": 9, "y": 1.12},
+                {"matrix": [5, 3], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1.12},
+                {"matrix": [5, 1], "x": 12, "y": 1.37},
+                {"matrix": [5, 0], "x": 13, "y": 1.37},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.37},
+                {"matrix": [2, 1], "x": 1, "y": 2.37},
+                {"matrix": [2, 2], "x": 2, "y": 2.12},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.12},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [6, 5], "x": 8, "y": 2.25},
+                {"matrix": [6, 4], "x": 9, "y": 2.12},
+                {"matrix": [6, 3], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2.12},
+                {"matrix": [6, 1], "x": 12, "y": 2.37},
+                {"matrix": [6, 0], "x": 13, "y": 2.37},
+
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5, "h": 1.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.5, "h": 1.25},
+
+                {"matrix": [7, 5], "x": 7.5, "y": 3.5, "h": 1.25},
+                {"matrix": [7, 4], "x": 8.5, "y": 3.5, "h": 1.25}
             ]
         }
     }
diff --git a/keyboards/oddball/oddball.h b/keyboards/oddball/oddball.h
index 2a8e2fd92d..7897621e2d 100644
--- a/keyboards/oddball/oddball.h
+++ b/keyboards/oddball/oddball.h
@@ -18,23 +18,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05,   R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,   R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,   R20, R21, R22, R23, R24, R25, \
-                        LT1, LT2,   RT1, RT2 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, LT1, LT2 }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { KC_NO, KC_NO, KC_NO, KC_NO, RT2, RT1 } \
-    }
-
 enum custom_keycodes {
     KC_SCROLL = QK_KB_0,
     KC_CPI_1,