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

3 files changed, 69 insertions, 128 deletions

diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 1f41cf4617..1014411ba0 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -24,68 +24,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0,  "y": 0}, 
-                {"label": "k01", "x": 1,  "y": 0}, 
-                {"label": "k02", "x": 2,  "y": 0}, 
-                {"label": "k03", "x": 3,  "y": 0}, 
-                {"label": "k04", "x": 4,  "y": 0}, 
-                {"label": "k05", "x": 5,  "y": 0}, 
-                {"label": "k50", "x": 7,  "y": 0}, 
-                {"label": "k51", "x": 8,  "y": 0}, 
-                {"label": "k52", "x": 9,  "y": 0}, 
-                {"label": "k53", "x": 10, "y": 0}, 
-                {"label": "k54", "x": 11, "y": 0}, 
-                {"label": "k55", "x": 12, "y": 0}, 
-				{"label": "k10", "x": 0,  "y": 1}, 
-                {"label": "k11", "x": 1,  "y": 1}, 
-                {"label": "k12", "x": 2,  "y": 1}, 
-                {"label": "k13", "x": 3,  "y": 1}, 
-                {"label": "k14", "x": 4,  "y": 1}, 
-                {"label": "k15", "x": 5,  "y": 1}, 
-                {"label": "k60", "x": 7,  "y": 1}, 
-                {"label": "k61", "x": 8,  "y": 1}, 
-                {"label": "k62", "x": 9,  "y": 1}, 
-                {"label": "k63", "x": 10, "y": 1}, 
-                {"label": "k64", "x": 11, "y": 1}, 
-                {"label": "k65", "x": 12, "y": 1}, 
-				{"label": "k20", "x": 0,  "y": 2}, 
-                {"label": "k21", "x": 1,  "y": 2}, 
-                {"label": "k22", "x": 2,  "y": 2}, 
-                {"label": "k23", "x": 3,  "y": 2}, 
-                {"label": "k24", "x": 4,  "y": 2}, 
-                {"label": "k25", "x": 5,  "y": 2}, 
-                {"label": "k70", "x": 7,  "y": 2}, 
-                {"label": "k71", "x": 8,  "y": 2}, 
-                {"label": "k72", "x": 9,  "y": 2}, 
-                {"label": "k73", "x": 10, "y": 2}, 
-                {"label": "k74", "x": 11, "y": 2}, 
-                {"label": "k75", "x": 12, "y": 2}, 
-				{"label": "k30", "x": 0,  "y": 3}, 
-                {"label": "k31", "x": 1,  "y": 3}, 
-                {"label": "k32", "x": 2,  "y": 3}, 
-                {"label": "k33", "x": 3,  "y": 3}, 
-                {"label": "k34", "x": 4,  "y": 3}, 
-                {"label": "k35", "x": 5,  "y": 3}, 
-				{"label": "k36", "x": 6,  "y": 3},
-                {"label": "k80", "x": 7,  "y": 3}, 
-                {"label": "k81", "x": 8,  "y": 3}, 
-                {"label": "k82", "x": 9,  "y": 3}, 
-                {"label": "k83", "x": 10, "y": 3}, 
-                {"label": "k84", "x": 11, "y": 3}, 
-                {"label": "k85", "x": 12, "y": 3}, 
-				{"label": "k40", "x": 0,  "y": 4}, 
-                {"label": "k41", "x": 1,  "y": 4}, 
-                {"label": "k42", "x": 2,  "y": 4}, 
-                {"label": "k43", "x": 3,  "y": 4}, 
-                {"label": "k44", "x": 4,  "y": 4}, 
-                {"label": "k45", "x": 5,  "y": 4}, 
-				{"label": "k46", "x": 6,  "y": 4},
-                {"label": "k90", "x": 7,  "y": 4}, 
-                {"label": "k91", "x": 8,  "y": 4}, 
-                {"label": "k92", "x": 9,  "y": 4}, 
-                {"label": "k93", "x": 10, "y": 4}, 
-                {"label": "k94", "x": 11, "y": 4}, 
-                {"label": "k95", "x": 12, "y": 4}
+                {"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": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "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": [3, 6], "x": 6, "y": 3},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mechwild/waka60/waka60.c b/keyboards/mechwild/waka60/waka60.c
deleted file mode 100644
index f0c5f143e4..0000000000
--- a/keyboards/mechwild/waka60/waka60.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "waka60.h"
diff --git a/keyboards/mechwild/waka60/waka60.h b/keyboards/mechwild/waka60/waka60.h
deleted file mode 100644
index 4e7d82e929..0000000000
--- a/keyboards/mechwild/waka60/waka60.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-/* 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.
- */
- 
-#define LAYOUT( \
-	k00, k01, k02, k03, k04, k05,      k50, k51, k52, k53, k54, k55, \
-	k10, k11, k12, k13, k14, k15,      k60, k61, k62, k63, k64, k65, \
-	k20, k21, k22, k23, k24, k25,      k70, k71, k72, k73, k74, k75, \
-	k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \
-	k40, k41, k42, k43, k44, k45, k46, k90, k91, k92, k93, k94, k95  \
-) { \
-    { k00, k01, k02, k03, k04, k05, ___}, \
-    { k10, k11, k12, k13, k14, k15, ___}, \
-    { k20, k21, k22, k23, k24, k25, ___}, \
-    { k30, k31, k32, k33, k34, k35, k36}, \
-    { k40, k41, k42, k43, k44, k45, k46}, \
-	{ k50, k51, k52, k53, k54, k55, ___}, \
-	{ k60, k61, k62, k63, k64, k65, ___}, \
-	{ k70, k71, k72, k73, k74, k75, ___}, \
-	{ k80, k81, k82, k83, k84, k85, ___}, \
-	{ k90, k91, k92, k93, k94, k95, ___}  \
-}