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

4 files changed, 50 insertions, 76 deletions

diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
index 9d08cbdaeb..75896018c7 100644
--- a/keyboards/uzu42/rev1/info.json
+++ b/keyboards/uzu42/rev1/info.json
@@ -24,48 +24,55 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Q", "x":0.375, "y":0},
-        {"label":"W", "x":1.375, "y":0},
-        {"label":"E", "x":2.375, "y":0},
-        {"label":"R", "x":3.375, "y":0.125},
-        {"label":"T", "x":4.375, "y":0.25},
-        {"label":"Y", "x":7.625, "y":0.25},
-        {"label":"U", "x":8.625, "y":0.125},
-        {"label":"I", "x":9.625, "y":0},
-        {"label":"O", "x":10.625, "y":0},
-        {"label":"P", "x":11.625, "y":0},
-        {"label":"A", "x":0.25, "y":1},
-        {"label":"S", "x":1.25, "y":1},
-        {"label":"D", "x":2.25, "y":1},
-        {"label":"F", "x":3.25, "y":1.125},
-        {"label":"G", "x":4.25, "y":1.25},
-        {"label":"H", "x":7.75, "y":1.25},
-        {"label":"J", "x":8.75, "y":1.125},
-        {"label":"K", "x":9.75, "y":1},
-        {"label":"L", "x":10.75, "y":1},
-        {"label":"Ent", "x":11.75, "y":1},
-        {"label":"Z", "x":0.125, "y":2},
-        {"label":"X", "x":1.125, "y":2},
-        {"label":"C", "x":2.125, "y":2},
-        {"label":"V", "x":3.125, "y":2.125},
-        {"label":"B", "x":4.125, "y":2.25},
-        {"label":"N", "x":7.875, "y":2.25},
-        {"label":"M", "x":8.875, "y":2.125},
-        {"label":",", "x":9.875, "y":2},
-        {"label":".", "x":10.875, "y":2},
-        {"label":"/", "x":11.875, "y":2},
-        {"label":"Shift", "x":0, "y":3},
-        {"label":"Space", "x":1, "y":3},
-        {"label":"Alt", "x":2, "y":3.05},
-        {"label":"GUI", "x":3, "y":3.18},
-        {"label":"Lower", "x":4, "y":3.3},
-        {"label":"Esc", "x":5, "y":3.43},
-        {"label":"Space", "x":7, "y":3.43},
-        {"label":"Raise", "x":8, "y":3.3},
-        {"label":"BkSpc", "x":9, "y":3.18},
-        {"label":"Ctrl", "x":10, "y":3.05},
-        {"label":"GUI", "x":11, "y":3},
-        {"label":"No", "x":12, "y":3}
+        {"matrix": [0, 0], "x": 0.375, "y": 0},
+        {"matrix": [0, 1], "x": 1.375, "y": 0},
+        {"matrix": [0, 2], "x": 2.375, "y": 0},
+        {"matrix": [0, 3], "x": 3.375, "y": 0.125},
+        {"matrix": [0, 4], "x": 4.375, "y": 0.25},
+
+        {"matrix": [4, 4], "x": 7.625, "y": 0.25},
+        {"matrix": [4, 3], "x": 8.625, "y": 0.125},
+        {"matrix": [4, 2], "x": 9.625, "y": 0},
+        {"matrix": [4, 1], "x": 10.625, "y": 0},
+        {"matrix": [4, 0], "x": 11.625, "y": 0},
+
+        {"matrix": [1, 0], "x": 0.25, "y": 1},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1.125},
+        {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+
+        {"matrix": [5, 4], "x": 7.75, "y": 1.25},
+        {"matrix": [5, 3], "x": 8.75, "y": 1.125},
+        {"matrix": [5, 2], "x": 9.75, "y": 1},
+        {"matrix": [5, 1], "x": 10.75, "y": 1},
+        {"matrix": [5, 0], "x": 11.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0.125, "y": 2},
+        {"matrix": [2, 1], "x": 1.125, "y": 2},
+        {"matrix": [2, 2], "x": 2.125, "y": 2},
+        {"matrix": [2, 3], "x": 3.125, "y": 2.125},
+        {"matrix": [2, 4], "x": 4.125, "y": 2.25},
+
+        {"matrix": [6, 4], "x": 7.875, "y": 2.25},
+        {"matrix": [6, 3], "x": 8.875, "y": 2.125},
+        {"matrix": [6, 2], "x": 9.875, "y": 2},
+        {"matrix": [6, 1], "x": 10.875, "y": 2},
+        {"matrix": [6, 0], "x": 11.875, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3.05},
+        {"matrix": [3, 3], "x": 3, "y": 3.18},
+        {"matrix": [3, 4], "x": 4, "y": 3.3},
+        {"matrix": [3, 5], "x": 5, "y": 3.43},
+
+        {"matrix": [7, 5], "x": 7, "y": 3.43},
+        {"matrix": [7, 4], "x": 8, "y": 3.3},
+        {"matrix": [7, 3], "x": 9, "y": 3.18},
+        {"matrix": [7, 2], "x": 10, "y": 3.05},
+        {"matrix": [7, 1], "x": 11, "y": 3},
+        {"matrix": [7, 0], "x": 12, "y": 3}
       ]
     }
   }
diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h
deleted file mode 100644
index 156605f87a..0000000000
--- a/keyboards/uzu42/rev1/rev1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "uzu42.h"
-
-#define LAYOUT( \
-  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
-  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
-  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
-  L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { R04, R03, R02, R01, R00 }, \
-    { R14, R13, R12, R11, R10 }, \
-    { R24, R23, R22, R21, R20 }, \
-    { R35, R34, R33, R32, R31, R30 } \
-  }
diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c
index 6a47ceac38..2e4c8ba93e 100644
--- a/keyboards/uzu42/uzu42.c
+++ b/keyboards/uzu42/uzu42.c
@@ -1,7 +1,7 @@
 // Copyright 2022 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "uzu42.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 #include <stdio.h>
diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h
deleted file mode 100644
index 8678588bc3..0000000000
--- a/keyboards/uzu42/uzu42.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_uzu42_rev1
-  #include "rev1.h"
-#endif