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

2 files changed, 56 insertions, 71 deletions

diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json
index ce4499442d..8ae8a33b44 100644
--- a/keyboards/dm9records/lain/info.json
+++ b/keyboards/dm9records/lain/info.json
@@ -18,55 +18,62 @@
     "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": 8.5, "y": 0 },
-                { "x": 9.5, "y": 0 },
-                { "x": 10.5, "y": 0 },
-                { "x": 11.5, "y": 0 },
-                { "x": 12.5, "y": 0 },
-                { "x": 13.5, "y": 0, "w": 1.5 },
-                { "x": 0.25, "y": 1 },
-                { "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": 8.75, "y": 1 },
-                { "x": 9.75, "y": 1 },
-                { "x": 10.75, "y": 1 },
-                { "x": 11.75, "y": 1 },
-                { "x": 12.75, "y": 1 },
-                { "x": 13.75, "y": 1 },
-                { "x": 0.5, "y": 2, "w": 1.25 },
-                { "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": 8.25, "y": 2 },
-                { "x": 9.25, "y": 2 },
-                { "x": 10.25, "y": 2 },
-                { "x": 11.25, "y": 2 },
-                { "x": 12.25, "y": 2 },
-                { "x": 13.25, "y": 2, "w": 1.25 },
-                { "x": 1, "y": 3, "w": 1.75 },
-                { "x": 2.75, "y": 3, "w": 1.25 },
-                { "x": 4, "y": 3 },
-                { "x": 5, "y": 3, "w": 1.25 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.75, "y": 3 },
-                { "x": 8.75, "y": 3, "w": 1.25 },
-                { "x": 10, "y": 3 },
-                { "x": 11, "y": 3 },
-                { "x": 12, "y": 3 },
-                { "x": 13, "y": 3, "w": 1.25 }
+                {"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": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"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},
+                {"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": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.25},
+                {"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, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/dm9records/lain/lain.h b/keyboards/dm9records/lain/lain.h
index e449416e50..ae0671a943 100644
--- a/keyboards/dm9records/lain/lain.h
+++ b/keyboards/dm9records/lain/lain.h
@@ -17,25 +17,3 @@ extern keyboard_config_t lain_config;
 void lain_set_led(uint8_t no, bool flag);
 void lain_enable_leds(bool flag);
 void lain_enable_leds_toggle(void);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-// clang-format off
-#define LAYOUT( \
-    k01,k02,k03,k04,k05,k06,k07,    k08,k09,k10,k11,k12,k13, \
-    k14,k15,k16,k17,k18,k19,k20,    k21,k22,k23,k24,k25,k26, \
-    k27,k28,k29,k30,k31,k32,        k33,k34,k35,k36,k37,k38, \
-            k39,k40,k41,k42,k43,    k44,k45,k46,k47,k48,k49) \
-    { \
-        {k01,  k02,  k03,k04,k05,k06,k07,    k08,k09,k10,k11,k12,k13}, \
-        {k14,  k15,  k16,k17,k18,k19,k20,    k21,k22,k23,k24,k25,k26}, \
-        {k27,  k28,  k29,k30,k31,k32,KC_NO,  k33,k34,k35,k36,k37,k38}, \
-        {KC_NO,k39,  k40,k41,k42,k43,KC_NO,  k44,k45,k46,k47,k48,k49} \
-    }
-// clang-format on