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

5 files changed, 77 insertions, 71 deletions

diff --git a/keyboards/kudox_game/info.json b/keyboards/kudox_game/info.json
index e927bb9439..6968b5e427 100644
--- a/keyboards/kudox_game/info.json
+++ b/keyboards/kudox_game/info.json
@@ -8,37 +8,5 @@
         "pid": "0x9696"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1.5, "y":0},
-                {"label":"2", "x":2.5, "y":0},
-                {"label":"3", "x":3.5, "y":0},
-                {"label":"4", "x":4.5, "y":0},
-                {"label":"5", "x":5.5, "y":0},
-                {"label":"Q", "x":1.75, "y":1},
-                {"label":"W", "x":2.75, "y":1},
-                {"label":"E", "x":3.75, "y":1},
-                {"label":"R", "x":4.75, "y":1},
-                {"label":"T", "x":5.75, "y":1},
-                {"label":"Ctrl-C", "x":0, "y":2},
-                {"label":"Ctrl-V", "x":1, "y":2},
-                {"label":"A", "x":2, "y":2},
-                {"label":"S", "x":3, "y":2},
-                {"label":"D", "x":4, "y":2},
-                {"label":"F", "x":5.25, "y":2},
-                {"label":"G", "x":6.25, "y":2},
-                {"label":"Shift", "x":0, "y":3, "w":1.5},
-                {"label":"Z", "x":1.5, "y":3},
-                {"label":"X", "x":3.75, "y":3},
-                {"label":"C", "x":4.75, "y":3},
-                {"label":"V", "x":5.75, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                {"label":"Layer", "x":5.5, "y":4.25, "h":1.5},
-                {"x":6.5, "y":4.75, "h":2}
-            ]
-        }
-    }
+    "bootloader": "caterina"
 }
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json
index d9fdf0ae35..7868308ead 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kudox_game/rev1/info.json
@@ -9,5 +9,42 @@
         "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D4", "D7", "E6", "B4", "B5"]
     },
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2}
+            ]
+        }
+    }
 }
diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h
deleted file mode 100644
index 52b30cf61b..0000000000
--- a/keyboards/kudox_game/rev1/rev1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  k00, k01, k02, k03, k04, k05,      \
-       k11, k12, k13, k14, k15,      \
-  k20, k21, k22, k23, k24, k25, k26, \
-  k30, k31,           k34, k35, k36, \
-  k40,                     k45, k46  \
-) \
-{ \
-    { k00,   k01,   k02,   k03,   k04,   k05,   KC_NO }, \
-    { KC_NO, k11,   k12,   k13,   k14,   k15,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26 }, \
-    { k30,   k31,   KC_NO, KC_NO, k34,   k35,   k36 }, \
-    { k40,   KC_NO, KC_NO, KC_NO, KC_NO, k45,   k46 } \
-}
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json
index 23e30a71c5..4a441b7385 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kudox_game/rev2/info.json
@@ -9,5 +9,42 @@
         "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
         "rows": ["D4", "D7", "E6", "B4", "B5"]
     },
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "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": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2}
+            ]
+        }
+    }
 }
diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h
deleted file mode 100644
index 52b30cf61b..0000000000
--- a/keyboards/kudox_game/rev2/rev2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  k00, k01, k02, k03, k04, k05,      \
-       k11, k12, k13, k14, k15,      \
-  k20, k21, k22, k23, k24, k25, k26, \
-  k30, k31,           k34, k35, k36, \
-  k40,                     k45, k46  \
-) \
-{ \
-    { k00,   k01,   k02,   k03,   k04,   k05,   KC_NO }, \
-    { KC_NO, k11,   k12,   k13,   k14,   k15,   KC_NO }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26 }, \
-    { k30,   k31,   KC_NO, KC_NO, k34,   k35,   k36 }, \
-    { k40,   KC_NO, KC_NO, KC_NO, KC_NO, k45,   k46 } \
-}