Move single `LAYOUT_all`s to data driven (#20430)

3 files changed, 53 insertions, 42 deletions

diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json
index 20207a6ef6..1b13b61cb9 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/info.json
@@ -22,7 +22,58 @@
     "bootloader": "usbasploader",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"encoder", "x":12, "y":0}, {"label":"1.5u", "x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"label":"1.5u", "x":11.5, "y":1, "w":1.5}, {"label":"1.75u", "x":0, "y":2, "w":1.75}, {"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":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"1.25u", "x":11.75, "y":2, "w":1.25}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"label":"1.75u", "x":11.25, "y":3, "w":1.75},{"label":"1.25u", "x":0, "y":4, "w":1.25}, {"label":"1u", "x":1.25, "y":4}, {"label":"1.25u", "x":2.25, "y":4, "w":1.25}, {"label":"2.25u", "x":3.5, "y":4, "w":2.25}, {"label":"1u", "x":5.75, "y":4}, {"label":"2.75u", "x":6.75, "y":4, "w":2.75}, {"label":"1.25u", "x":9.5, "y":4, "w":1.25}, {"label":"1u", "x":10.75, "y":4}, {"label":"1.25u", "x":11.75, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [4, 2], "x": 12, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 1},
+                {"matrix": [0, 2], "x": 2.5, "y": 1},
+                {"matrix": [0, 3], "x": 3.5, "y": 1},
+                {"matrix": [0, 4], "x": 4.5, "y": 1},
+                {"matrix": [0, 5], "x": 5.5, "y": 1},
+                {"matrix": [0, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 6], "x": 7.5, "y": 1},
+                {"matrix": [4, 5], "x": 8.5, "y": 1},
+                {"matrix": [4, 4], "x": 9.5, "y": 1},
+                {"matrix": [4, 3], "x": 10.5, "y": 1},
+                {"matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 2},
+                {"matrix": [1, 2], "x": 2.75, "y": 2},
+                {"matrix": [1, 3], "x": 3.75, "y": 2},
+                {"matrix": [1, 4], "x": 4.75, "y": 2},
+                {"matrix": [1, 5], "x": 5.75, "y": 2},
+                {"matrix": [1, 6], "x": 6.75, "y": 2},
+                {"matrix": [5, 6], "x": 7.75, "y": 2},
+                {"matrix": [5, 5], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 1], "x": 10.75, "y": 2},
+                {"matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [2, 3], "x": 3.25, "y": 3},
+                {"matrix": [2, 4], "x": 4.25, "y": 3},
+                {"matrix": [2, 5], "x": 5.25, "y": 3},
+                {"matrix": [2, 6], "x": 6.25, "y": 3},
+                {"matrix": [6, 6], "x": 7.25, "y": 3},
+                {"matrix": [6, 5], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 3], "x": 10.25, "y": 3},
+                {"matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 4},
+                {"matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 4},
+                {"matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+                {"matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [3, 2], "x": 10.75, "y": 4},
+                {"matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/mechwild/mercutio/mercutio.c b/keyboards/mechwild/mercutio/mercutio.c
index c0369397d1..0214142582 100755
--- a/keyboards/mechwild/mercutio/mercutio.c
+++ b/keyboards/mechwild/mercutio/mercutio.c
@@ -15,7 +15,7 @@
  */
 
 
-#include "mercutio.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 static const char PROGMEM mercutio_name[] = {
diff --git a/keyboards/mechwild/mercutio/mercutio.h b/keyboards/mechwild/mercutio/mercutio.h
deleted file mode 100644
index a0726944b8..0000000000
--- a/keyboards/mechwild/mercutio/mercutio.h
+++ /dev/null
@@ -1,40 +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
-
-
-#define LAYOUT_all( \
-                                                         KEN, \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-  K30, K31, K32,      K34,      K36, K37,      K39, K3A, K3B  \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16 }, \
-	{ K20,   K21,   K3B,   K23,   K24,   K25,   K26 }, \
-	{ K30,   K32,   K3A,   K39,   K34,   K36,   K37 }, \
-	{ ___,   K1A,   KEN,   K0A,   K09,   K08,   K07 }, \
-	{ ___,   K31,   K0B,   K1B,   K19,   K18,   K17 }, \
-	{ ___,   K22,   K2B,   K2A,   K29,   K28,   K27 }  \
-}
-
-
-