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

2 files changed, 57 insertions, 21 deletions

diff --git a/keyboards/wsk/houndstooth/houndstooth.h b/keyboards/wsk/houndstooth/houndstooth.h
deleted file mode 100644
index 41a680ec9b..0000000000
--- a/keyboards/wsk/houndstooth/houndstooth.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, K05, K40, K41, K42, K43, K44, K45,\
-	K10, K11, K12, K13, K14, K15, K50, K51, K52, K53, K54, K55,\
-	K20, K21, K22, K23, K24, K25, K60, K61, K62, K63, K64, K65,\
-	K30, K31, K32, K33, K34, K35, K70, K71, K72, K73, K74, K75 \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45 }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55 }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65 }, \
-	{ K70,   K71,   K72,   K73,   K74,   K75 }  \
-}
-
diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json
index bdcfebbdb4..d281bff045 100644
--- a/keyboards/wsk/houndstooth/info.json
+++ b/keyboards/wsk/houndstooth/info.json
@@ -20,7 +20,63 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"Back Space", "x":11.5, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":";", "x":10.5, "y":1}, {"label":"'", "x":11.5, "y":1}, {"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":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":",", "x":8.5, "y":2}, {"label":".", "x":9.5, "y":2}, {"label":"/", "x":10.5, "y":2}, {"label":"Return", "x":11.5, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6.5, "y":3}, {"label":"⇑", "x":7.5, "y":3}, {"label":"←", "x":8.5, "y":3}, {"label":"↓", "x":9.5, "y":3}, {"label":"↑", "x":10.5, "y":3}, {"label":"→", "x":11.5, "y":3}]
+            "layout": [
+                {"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": [4, 0], "x": 6.5, "y": 0},
+                {"matrix": [4, 1], "x": 7.5, "y": 0},
+                {"matrix": [4, 2], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
+                {"matrix": [4, 4], "x": 10.5, "y": 0},
+                {"matrix": [4, 5], "x": 11.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 1},
+                {"matrix": [5, 1], "x": 7.5, "y": 1},
+                {"matrix": [5, 2], "x": 8.5, "y": 1},
+                {"matrix": [5, 3], "x": 9.5, "y": 1},
+                {"matrix": [5, 4], "x": 10.5, "y": 1},
+                {"matrix": [5, 5], "x": 11.5, "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, "y": 2},
+
+                {"matrix": [6, 0], "x": 6.5, "y": 2},
+                {"matrix": [6, 1], "x": 7.5, "y": 2},
+                {"matrix": [6, 2], "x": 8.5, "y": 2},
+                {"matrix": [6, 3], "x": 9.5, "y": 2},
+                {"matrix": [6, 4], "x": 10.5, "y": 2},
+                {"matrix": [6, 5], "x": 11.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [7, 0], "x": 6.5, "y": 3},
+                {"matrix": [7, 1], "x": 7.5, "y": 3},
+                {"matrix": [7, 2], "x": 8.5, "y": 3},
+                {"matrix": [7, 3], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3}
+            ]
         }
     }
 }