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

2 files changed, 59 insertions, 21 deletions

diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json
index af2112d63b..b5d0f9459b 100644
--- a/keyboards/wsk/kodachi50/info.json
+++ b/keyboards/wsk/kodachi50/info.json
@@ -20,7 +20,65 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"{", "x":6.5, "y":0}, {"label":"}", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Backspace", "x":13.5, "y":0, "w":1.5}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"|", "x":6.25, "y":1, "w":1.25}, {"label":"Alt", "x":7.5, "y":1, "w":1.25}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":"\"", "x":12.75, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"~", "x":6, "y":2}, {"label":"_", "x":7, "y":2}, {"label":"+", "x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.75}, {"x":6.5, "y":3}, {"x":7.5, "y":3, "w":2.25}, {"label":"Win", "x":9.75, "y":3, "w":1.25}, {"label":"Left", "x":11, "y":3}, {"label":"Down", "x":12, "y":3}, {"label":"Up", "x":13, "y":3}, {"label":"Right", "x":14, "y":3}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"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": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [7, 6], "x": 7.5, "y": 0},
+                {"matrix": [7, 5], "x": 8.5, "y": 0},
+                {"matrix": [7, 4], "x": 9.5, "y": 0},
+                {"matrix": [7, 3], "x": 10.5, "y": 0},
+                {"matrix": [7, 2], "x": 11.5, "y": 0},
+                {"matrix": [7, 1], "x": 12.5, "y": 0},
+                {"matrix": [7, 0], "x": 13.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"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, "w": 1.25},
+                {"matrix": [6, 6], "x": 7.5, "y": 1, "w": 1.25},
+                {"matrix": [6, 5], "x": 8.75, "y": 1},
+                {"matrix": [6, 4], "x": 9.75, "y": 1},
+                {"matrix": [6, 3], "x": 10.75, "y": 1},
+                {"matrix": [6, 2], "x": 11.75, "y": 1},
+                {"matrix": [6, 1], "x": 12.75, "y": 1},
+                {"matrix": [6, 0], "x": 13.75, "y": 1, "w": 1.25},
+
+                {"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, "y": 2},
+                {"matrix": [3, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [5, 6], "x": 8, "y": 2},
+                {"matrix": [5, 5], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [5, 3], "x": 11, "y": 2},
+                {"matrix": [5, 2], "x": 12, "y": 2},
+                {"matrix": [5, 1], "x": 13, "y": 2},
+                {"matrix": [5, 0], "x": 14, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [4, 6], "x": 7.5, "y": 3, "w": 2.25},
+                {"matrix": [4, 4], "x": 9.75, "y": 3, "w": 1.25},
+                {"matrix": [4, 3], "x": 11, "y": 3},
+                {"matrix": [4, 2], "x": 12, "y": 3},
+                {"matrix": [4, 1], "x": 13, "y": 3},
+                {"matrix": [4, 0], "x": 14, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/wsk/kodachi50/kodachi50.h b/keyboards/wsk/kodachi50/kodachi50.h
deleted file mode 100644
index 15fc9ac0ce..0000000000
--- a/keyboards/wsk/kodachi50/kodachi50.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K76, K75, K74, K73, K72, K71, K70,  \
-    K10, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, \
-    K20, K21, K22, K23, K24, K25, K35, K26, K56, K55, K54, K53, K52, K51, K50, \
-    K30, K31, K32,           K34, K36, K46,           K44, K43, K42, K41, K40        \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06 }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16 }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26 }, \
-    { K30,   K31,   K32,   KC_NO, K34,   K35,   K36 }, \
-    { K40,   K41,   K42,   K43,   K44,   KC_NO, K46 }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56 }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66 }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76 }  \
-}
-