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

3 files changed, 83 insertions, 111 deletions

diff --git a/keyboards/heliar/wm1_hotswap/info.json b/keyboards/heliar/wm1_hotswap/info.json
index 77bf189dab..b534f6e8d6 100644
--- a/keyboards/heliar/wm1_hotswap/info.json
+++ b/keyboards/heliar/wm1_hotswap/info.json
@@ -21,74 +21,88 @@
     "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": 9, "y": 0},
-                {"label": "k08", "x": 10, "y": 0},
-                {"label": "k09", "x": 11, "y": 0},
-                {"label": "k0a", "x": 12, "y": 0},
-                {"label": "k0b", "x": 13, "y": 0},
-                {"label": "k0c", "x": 14, "y": 0},
-                {"label": "k0d", "x": 15, "y": 0, "w": 2},
-                {"label": "k0e", "x": 17.25, "y": 0},
-                {"label": "k10", "x": 0, "y": 1, "w": 1.5},
-                {"label": "k11", "x": 1.5, "y": 1},
-                {"label": "k12", "x": 2.5, "y": 1},
-                {"label": "k13", "x": 3.5, "y": 1},
-                {"label": "k14", "x": 4.5, "y": 1},
-                {"label": "k15", "x": 5.5, "y": 1},
-                {"label": "k16", "x": 8.5, "y": 1},
-                {"label": "k17", "x": 9.5, "y": 1},
-                {"label": "k18", "x": 10.5, "y": 1},
-                {"label": "k19", "x": 11.5, "y": 1},
-                {"label": "k1a", "x": 12.5, "y": 1},
-                {"label": "k1b", "x": 13.5, "y": 1},
-                {"label": "k1c", "x": 14.5, "y": 1},
-                {"label": "k1d", "x": 15.5, "y": 1, "w": 1.5},
-                {"label": "k1e", "x": 17.25, "y": 1},
-                {"label": "k20", "x": 0, "y": 2, "w": 1.75},
-                {"label": "k21", "x": 1.75, "y": 2},
-                {"label": "k22", "x": 2.75, "y": 2},
-                {"label": "k23", "x": 3.75, "y": 2},
-                {"label": "k24", "x": 4.75, "y": 2},
-                {"label": "k25", "x": 5.75, "y": 2},
-                {"label": "k26", "x": 8.75, "y": 2},
-                {"label": "k27", "x": 9.75, "y": 2},
-                {"label": "k28", "x": 10.75, "y": 2},
-                {"label": "k29", "x": 11.75, "y": 2},
-                {"label": "k2a", "x": 12.75, "y": 2},
-                {"label": "k2b", "x": 13.75, "y": 2},
-                {"label": "k2d", "x": 14.75, "y": 2, "w": 2.25},
-                {"label": "k2e", "x": 17.25, "y": 2},
-                {"label": "k30", "x": 0, "y": 3, "w": 2.25},
-                {"label": "k31", "x": 2.25, "y": 3},
-                {"label": "k32", "x": 3.25, "y": 3},
-                {"label": "k33", "x": 4.25, "y": 3},
-                {"label": "k34", "x": 5.25, "y": 3},
-                {"label": "k35", "x": 6.25, "y": 3},
-                {"label": "k36", "x": 8.25, "y": 3},
-                {"label": "k37", "x": 9.25, "y": 3},
-                {"label": "k38", "x": 10.25, "y": 3},
-                {"label": "k39", "x": 11.25, "y": 3},
-                {"label": "k3a", "x": 12.25, "y": 3},
-                {"label": "k3b", "x": 13.25, "y": 3},
-                {"label": "k3c", "x": 14.25, "y": 3, "w": 1.75},
-                {"label": "k3d", "x": 16.25, "y": 3.25},
-                {"label": "k40", "x": 0, "y": 4, "w": 1.5},
-                {"label": "k42", "x": 3, "y": 4, "w": 1.5},
-                {"label": "k43", "x": 4.5, "y": 4},
-                {"label": "k44", "x": 5.5, "y": 4, "w": 2},
-                {"label": "k46", "x": 8.25, "y": 4, "w": 2.75},
-                {"label": "k49", "x": 11, "y": 4, "w": 1.5},
-                {"label": "k4b", "x": 13.5, "y": 4, "w": 1.5},
-                {"label": "k4c", "x": 15.25, "y": 4.25},
-                {"label": "k4d", "x": 16.25, "y": 4.25},
-                {"label": "k4e", "x": 17.25, "y": 4.25}
+                {"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": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 15, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8.5, "y": 1},
+                {"matrix": [1, 7], "x": 9.5, "y": 1},
+                {"matrix": [1, 8], "x": 10.5, "y": 1},
+                {"matrix": [1, 9], "x": 11.5, "y": 1},
+                {"matrix": [1, 10], "x": 12.5, "y": 1},
+                {"matrix": [1, 11], "x": 13.5, "y": 1},
+                {"matrix": [1, 12], "x": 14.5, "y": 1},
+                {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [2, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 8], "x": 10.75, "y": 2},
+                {"matrix": [2, 9], "x": 11.75, "y": 2},
+                {"matrix": [2, 10], "x": 12.75, "y": 2},
+                {"matrix": [2, 11], "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 12.25, "y": 3},
+                {"matrix": [3, 11], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4},
+                {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 2},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/heliar/wm1_hotswap/wm1_hotswap.c b/keyboards/heliar/wm1_hotswap/wm1_hotswap.c
index 08f1469e3d..846729a3f0 100644
--- a/keyboards/heliar/wm1_hotswap/wm1_hotswap.c
+++ b/keyboards/heliar/wm1_hotswap/wm1_hotswap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wm1_hotswap.h"
+#include "quantum.h"
 
 
 void keyboard_pre_init_kb(void)
diff --git a/keyboards/heliar/wm1_hotswap/wm1_hotswap.h b/keyboards/heliar/wm1_hotswap/wm1_hotswap.h
deleted file mode 100644
index 295fc8097c..0000000000
--- a/keyboards/heliar/wm1_hotswap/wm1_hotswap.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 HELIAR MK
- *
- * 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, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
-	K40,      K42, K43, K44,      K46,           K49,      K4B, K4C, K4D, K4E  \
-)\
-{\
-	{K00, K01,   K02,   K03, K04, K05, 	K06,	K07,	K08,	K09, K0A,   K0B, K0C,   K0D,	K0E},  \
-	{K10, K11,   K12,   K13, K14, K15, 	K16,	K17,	K18,	K19, K1A,   K1B, K1C,   K1D,	K1E},  \
-	{K20, K21,   K22,   K23, K24, K25, 	K26,	K27,	K28,	K29, K2A,   K2B, KC_NO,	K2D,    K2E},  \
-	{K30, K31,   K32,   K33, K34, K35, 	K36,	K37,	K38,	K39, K3A,   K3B, K3C,   K3D,	KC_NO},\
-	{K40, KC_NO, K42, 	K43, K44, KC_NO,K46, 	KC_NO,	KC_NO,	K49, KC_NO, K4B, K4C,   K4D,	K4E}   \
-}