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

2 files changed, 52 insertions, 64 deletions

diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
index 9173f12edc..622e534864 100644
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ b/keyboards/dailycraft/claw44/rev1/info.json
@@ -21,50 +21,58 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":1.18},
-                {"label":"L01", "x":1, "y":1.03},
-                {"label":"L02", "x":2, "y":0.35},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0.05},
-                {"label":"L05", "x":5, "y":0.1},
-                {"label":"R00", "x":11.5, "y":0.1},
-                {"label":"R01", "x":12.5, "y":0.05},
-                {"label":"R02", "x":13.5, "y":0},
-                {"label":"R03", "x":14.5, "y":0.35},
-                {"label":"R04", "x":15.5, "y":1.08},
-                {"label":"R05", "x":16.5, "y":1.18},
-                {"label":"L10", "x":0, "y":2.18},
-                {"label":"L11", "x":1, "y":2.03},
-                {"label":"L12", "x":2, "y":1.35},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1.05},
-                {"label":"L15", "x":5, "y":1.1},
-                {"label":"R10", "x":11.5, "y":1.1},
-                {"label":"R11", "x":12.5, "y":1.05},
-                {"label":"R12", "x":13.5, "y":1},
-                {"label":"R13", "x":14.5, "y":1.35},
-                {"label":"R14", "x":15.5, "y":2.03},
-                {"label":"R15", "x":16.5, "y":2.18},
-                {"label":"L20", "x":0, "y":3.18},
-                {"label":"L21", "x":1, "y":3.03},
-                {"label":"L22", "x":2, "y":2.35},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2.05},
-                {"label":"L25", "x":5, "y":2.1},
-                {"label":"R20", "x":11.5, "y":2.1},
-                {"label":"R21", "x":12.5, "y":2.05},
-                {"label":"R22", "x":13.5, "y":2},
-                {"label":"R23", "x":14.5, "y":2.35},
-                {"label":"R24", "x":15.5, "y":3.03},
-                {"label":"R25", "x":16.5, "y":3.18},
-                {"label":"L30", "x":4, "y":3.05},
-                {"label":"L31", "x":5, "y":3.1},
-                {"label":"L32", "x":6, "y":3.2, "w":1.25},
-                {"label":"L33", "x":7.25, "y":3.5},
-                {"label":"R30", "x":9.25, "y":3.5},
-                {"label":"R31", "x":10.25, "y":3.2, "w":1.25},
-                {"label":"R32", "x":11.5, "y":3.1},
-                {"label":"R33", "x":12.5, "y":3.05}
+                {"matrix": [0, 0], "x": 0, "y": 1.18},
+                {"matrix": [0, 1], "x": 1, "y": 1.03},
+                {"matrix": [0, 2], "x": 2, "y": 0.35},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.05},
+                {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+                {"matrix": [4, 5], "x": 11.5, "y": 0.1},
+                {"matrix": [4, 4], "x": 12.5, "y": 0.05},
+                {"matrix": [4, 3], "x": 13.5, "y": 0},
+                {"matrix": [4, 2], "x": 14.5, "y": 0.35},
+                {"matrix": [4, 1], "x": 15.5, "y": 1.08},
+                {"matrix": [4, 0], "x": 16.5, "y": 1.18},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.18},
+                {"matrix": [1, 1], "x": 1, "y": 2.03},
+                {"matrix": [1, 2], "x": 2, "y": 1.35},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.05},
+                {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+                {"matrix": [5, 5], "x": 11.5, "y": 1.1},
+                {"matrix": [5, 4], "x": 12.5, "y": 1.05},
+                {"matrix": [5, 3], "x": 13.5, "y": 1},
+                {"matrix": [5, 2], "x": 14.5, "y": 1.35},
+                {"matrix": [5, 1], "x": 15.5, "y": 2.03},
+                {"matrix": [5, 0], "x": 16.5, "y": 2.18},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.18},
+                {"matrix": [2, 1], "x": 1, "y": 3.03},
+                {"matrix": [2, 2], "x": 2, "y": 2.35},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.05},
+                {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+                {"matrix": [6, 5], "x": 11.5, "y": 2.1},
+                {"matrix": [6, 4], "x": 12.5, "y": 2.05},
+                {"matrix": [6, 3], "x": 13.5, "y": 2},
+                {"matrix": [6, 2], "x": 14.5, "y": 2.35},
+                {"matrix": [6, 1], "x": 15.5, "y": 3.03},
+                {"matrix": [6, 0], "x": 16.5, "y": 3.18},
+
+                {"matrix": [3, 2], "x": 4, "y": 3.05},
+                {"matrix": [3, 3], "x": 5, "y": 3.1},
+                {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25},
+
+                {"matrix": [3, 5], "x": 7.25, "y": 3.5},
+
+                {"matrix": [7, 5], "x": 9.25, "y": 3.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25},
+                {"matrix": [7, 3], "x": 11.5, "y": 3.1},
+                {"matrix": [7, 2], "x": 12.5, "y": 3.05}
             ]
         }
     }
diff --git a/keyboards/dailycraft/claw44/rev1/rev1.h b/keyboards/dailycraft/claw44/rev1/rev1.h
deleted file mode 100644
index 9a05977153..0000000000
--- a/keyboards/dailycraft/claw44/rev1/rev1.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#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, \
-                   L30, L31, L32, L33, R30, R31, R32, R33 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05 }, \
-        { L10, L11, L12, L13, L14, L15 }, \
-        { L20, L21, L22, L23, L24, L25 }, \
-        { KC_NO, KC_NO, L30, L31, L32, L33 }, \
-        { R05, R04, R03, R02, R01, R00 }, \
-        { R15, R14, R13, R12, R11, R10 }, \
-        { R25, R24, R23, R22, R21, R20 }, \
-        { KC_NO, KC_NO, R33, R32, R31, R30 } \
-    }