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

2 files changed, 72 insertions, 109 deletions

diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json
index 0e79cae73e..ef7658a1e1 100644
--- a/keyboards/mechkeys/mk60/info.json
+++ b/keyboards/mechkeys/mk60/info.json
@@ -30,74 +30,78 @@
     "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":"K06", "x":6, "y":0},
-          {"label":"K07", "x":7, "y":0},
-          {"label":"K08", "x":8, "y":0},
-          {"label":"K09", "x":9, "y":0},
-          {"label":"K0A", "x":10, "y":0},
-          {"label":"K0B", "x":11, "y":0},
-          {"label":"K0C", "x":12, "y":0},
-          {"label":"K0D", "x":13, "y":0},
-          {"label":"K0E", "x":14, "y":0},
-          {"label":"K10", "x":0, "y":1, "w":1.5},
-          {"label":"K12", "x":1.5, "y":1},
-          {"label":"K13", "x":2.5, "y":1},
-          {"label":"K14", "x":3.5, "y":1},
-          {"label":"K15", "x":4.5, "y":1},
-          {"label":"K16", "x":5.5, "y":1},
-          {"label":"K17", "x":6.5, "y":1},
-          {"label":"K18", "x":7.5, "y":1},
-          {"label":"K19", "x":8.5, "y":1},
-          {"label":"K1A", "x":9.5, "y":1},
-          {"label":"K1B", "x":10.5, "y":1},
-          {"label":"K1C", "x":11.5, "y":1},
-          {"label":"K1D", "x":12.5, "y":1},
-          {"label":"K1E", "x":13.5, "y":1, "w":1.5},
-          {"label":"K20", "x":0, "y":2, "w":1.75},
-          {"label":"K22", "x":1.75, "y":2},
-          {"label":"K23", "x":2.75, "y":2},
-          {"label":"K24", "x":3.75, "y":2},
-          {"label":"K25", "x":4.75, "y":2},
-          {"label":"K26", "x":5.75, "y":2},
-          {"label":"K27", "x":6.75, "y":2},
-          {"label":"K28", "x":7.75, "y":2},
-          {"label":"K29", "x":8.75, "y":2},
-          {"label":"K2A", "x":9.75, "y":2},
-          {"label":"K2B", "x":10.75, "y":2},
-          {"label":"K2C", "x":11.75, "y":2},
-          {"label":"K2D", "x":12.75, "y":2, "w":2.25},
-          {"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":"K37", "x":7, "y":3},
-          {"label":"K38", "x":8, "y":3},
-          {"label":"K39", "x":9, "y":3},
-          {"label":"K3A", "x":10, "y":3},
-          {"label":"K3B", "x":11, "y":3},
-          {"label":"K3C", "x":12, "y":3},
-          {"label":"K3D", "x":13, "y":3},
-          {"label":"K3E", "x":14, "y":3},
-          {"label":"K40", "x":0, "y":4, "w":1.75},
-          {"label":"K42", "x":1.75, "y":4, "w":1.25},
-          {"label":"K43", "x":3, "y":4, "w":1.25},
-          {"label":"K44", "x":4.25, "y":4, "w":1.25},
-          {"label":"K47", "x":5.5, "y":4, "w":3},
-          {"label":"K49", "x":8.5, "y":4, "w":1.5},
-          {"label":"K4A", "x":10, "y":4},
-          {"label":"K4B", "x":11, "y":4},
-          {"label":"K4C", "x":12, "y":4},
-          {"label":"K4D", "x":13, "y":4},
-          {"label":"K4E", "x":14, "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": [0, 6], "x": 6, "y": 0},
+          {"matrix": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+          {"matrix": [0, 10], "x": 10, "y": 0},
+          {"matrix": [0, 11], "x": 11, "y": 0},
+          {"matrix": [0, 12], "x": 12, "y": 0},
+          {"matrix": [0, 13], "x": 13, "y": 0},
+          {"matrix": [0, 14], "x": 14, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 2], "x": 1.5, "y": 1},
+          {"matrix": [1, 3], "x": 2.5, "y": 1},
+          {"matrix": [1, 4], "x": 3.5, "y": 1},
+          {"matrix": [1, 5], "x": 4.5, "y": 1},
+          {"matrix": [1, 6], "x": 5.5, "y": 1},
+          {"matrix": [1, 7], "x": 6.5, "y": 1},
+          {"matrix": [1, 8], "x": 7.5, "y": 1},
+          {"matrix": [1, 9], "x": 8.5, "y": 1},
+          {"matrix": [1, 10], "x": 9.5, "y": 1},
+          {"matrix": [1, 11], "x": 10.5, "y": 1},
+          {"matrix": [1, 12], "x": 11.5, "y": 1},
+          {"matrix": [1, 13], "x": 12.5, "y": 1},
+          {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 2], "x": 1.75, "y": 2},
+          {"matrix": [2, 3], "x": 2.75, "y": 2},
+          {"matrix": [2, 4], "x": 3.75, "y": 2},
+          {"matrix": [2, 5], "x": 4.75, "y": 2},
+          {"matrix": [2, 6], "x": 5.75, "y": 2},
+          {"matrix": [2, 7], "x": 6.75, "y": 2},
+          {"matrix": [2, 8], "x": 7.75, "y": 2},
+          {"matrix": [2, 9], "x": 8.75, "y": 2},
+          {"matrix": [2, 10], "x": 9.75, "y": 2},
+          {"matrix": [2, 11], "x": 10.75, "y": 2},
+          {"matrix": [2, 12], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+          {"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": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [3, 9], "x": 9, "y": 3},
+          {"matrix": [3, 10], "x": 10, "y": 3},
+          {"matrix": [3, 11], "x": 11, "y": 3},
+          {"matrix": [3, 12], "x": 12, "y": 3},
+          {"matrix": [3, 13], "x": 13, "y": 3},
+          {"matrix": [3, 14], "x": 14, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+          {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25},
+          {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+          {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 3},
+          {"matrix": [4, 9], "x": 8.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 10], "x": 10, "y": 4},
+          {"matrix": [4, 11], "x": 11, "y": 4},
+          {"matrix": [4, 12], "x": 12, "y": 4},
+          {"matrix": [4, 13], "x": 13, "y": 4},
+          {"matrix": [4, 14], "x": 14, "y": 4}
         ]
       }
     }
diff --git a/keyboards/mechkeys/mk60/mk60.h b/keyboards/mechkeys/mk60/mk60.h
deleted file mode 100644
index 66eb416a6f..0000000000
--- a/keyboards/mechkeys/mk60/mk60.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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"
-
-/* This 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, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
-    k40,      k42, k43, k44,           k47,      k49, k4A, k4B, k4C, k4D, k4E \
-) \
-{ \
-    { k00, k01,   k02, k03, k04, k05,   k06,   k07, k08,   k09, k0A, k0B, k0C, k0D, k0E},   \
-    { k10, KC_NO, k12, k13, k14, k15,   k16,   k17, k18,   k19, k1A, k1B, k1C, k1D, k1E},   \
-    { k20, KC_NO, k22, k23, k24, k25,   k26,   k27, k28,   k29, k2A, k2B, k2C, k2D, KC_NO}, \
-    { k30, k31,   k32, k33, k34, k35,   k36,   k37, k38,   k39, k3A, k3B, k3C, k3D, k3E},   \
-    { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, k49, k4A, k4B, k4C, k4D, k4E},   \
-}