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

2 files changed, 100 insertions, 112 deletions

diff --git a/keyboards/handwired/hwpm87/hwpm87.h b/keyboards/handwired/hwpm87/hwpm87.h
deleted file mode 100644
index 7de32eaa8c..0000000000
--- a/keyboards/handwired/hwpm87/hwpm87.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 CAO THAI DUONG (@KD-MM2)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, \
-    K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, XXX, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F, K1G, K1H }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX, XXX }, \
-    { XXX, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, XXX, K4G, XXX }, \
-    { K50, K51, XXX, K53, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F, K5G, K5H }, \
-}
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
index a719ba5ef2..88079c32ad 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/info.json
@@ -22,95 +22,107 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00 (B0,D3)", "x": 0, "y": 0 },
-                { "label": "K02 (B0,D1)", "x": 2, "y": 0 },
-                { "label": "K03 (B0,D0)", "x": 3, "y": 0 },
-                { "label": "K04 (B0,D4)", "x": 4, "y": 0 },
-                { "label": "K05 (B0,C6)", "x": 5, "y": 0 },
-                { "label": "K07 (B0,E6)", "x": 6.5, "y": 0 },
-                { "label": "K08 (B0,B7)", "x": 7.5, "y": 0 },
-                { "label": "K09 (B0,F0)", "x": 8.5, "y": 0 },
-                { "label": "K0A (B0,F1)", "x": 9.5, "y": 0 },
-                { "label": "K0B (B0,D5)", "x": 11, "y": 0 },
-                { "label": "K0C (B0,D6)", "x": 12, "y": 0 },
-                { "label": "K0D (B0,C7)", "x": 13, "y": 0 },
-                { "label": "K0E (B0,E2)", "x": 14, "y": 0 },
-                { "label": "K0F (B0,B6)", "x": 15.25, "y": 0 },
-                { "label": "K0G (B0,F7)", "x": 16.25, "y": 0 },
-                { "label": "K0H (B0,F6)", "x": 17.25, "y": 0 },
-                { "label": "K10 (B1,D3)", "x": 0, "y": 1 },
-                { "label": "K11 (B1,D2)", "x": 1, "y": 1 },
-                { "label": "K12 (B1,D1)", "x": 2, "y": 1 },
-                { "label": "K13 (B1,D0)", "x": 3, "y": 1 },
-                { "label": "K14 (B1,D4)", "x": 4, "y": 1 },
-                { "label": "K15 (B1,C6)", "x": 5, "y": 1 },
-                { "label": "K16 (B1,D7)", "x": 6, "y": 1 },
-                { "label": "K17 (B1,E6)", "x": 7, "y": 1 },
-                { "label": "K18 (B1,B7)", "x": 8, "y": 1 },
-                { "label": "K19 (B1,F0)", "x": 9, "y": 1 },
-                { "label": "K1A (B1,F1)", "x": 10, "y": 1 },
-                { "label": "K1B (B1,D5)", "x": 11, "y": 1 },
-                { "label": "K1C (B1,D6)", "x": 12, "y": 1 },
-                { "label": "K1E (B1,E2)", "x": 13, "y": 1, "w": 2 },
-                { "label": "K1F (B1,B6)", "x": 15.25, "y": 1 },
-                { "label": "K1G (B1,F7)", "x": 16.25, "y": 1 },
-                { "label": "K1H (B1,F6)", "x": 17.25, "y": 1 },
-                { "label": "K20 (B2,D3)", "x": 0, "y": 2, "w": 1.5 },
-                { "label": "K22 (B2,D1)", "x": 1.5, "y": 2 },
-                { "label": "K23 (B2,D0)", "x": 2.5, "y": 2 },
-                { "label": "K24 (B2,D4)", "x": 3.5, "y": 2 },
-                { "label": "K25 (B2,C6)", "x": 4.5, "y": 2 },
-                { "label": "K26 (B2,D7)", "x": 5.5, "y": 2 },
-                { "label": "K27 (B2,E6)", "x": 6.5, "y": 2 },
-                { "label": "K28 (B2,B7)", "x": 7.5, "y": 2 },
-                { "label": "K29 (B2,F0)", "x": 8.5, "y": 2 },
-                { "label": "K2A (B2,F1)", "x": 9.5, "y": 2 },
-                { "label": "K2B (B2,D5)", "x": 10.5, "y": 2 },
-                { "label": "K2C (B2,D6)", "x": 11.5, "y": 2 },
-                { "label": "K2D (B2,C7)", "x": 12.5, "y": 2 },
-                { "label": "K2E (B2,E2)", "x": 13.5, "y": 2, "w": 1.5 },
-                { "label": "K2F (B2,B6)", "x": 15.25, "y": 2 },
-                { "label": "K2G (B2,F7)", "x": 16.25, "y": 2 },
-                { "label": "K2H (B2,F6)", "x": 17.25, "y": 2 },
-                { "label": "K30 (B3,D3)", "x": 0, "y": 3, "w": 1.75 },
-                { "label": "K32 (B3,D1)", "x": 1.75, "y": 3 },
-                { "label": "K33 (B3,D0)", "x": 2.75, "y": 3 },
-                { "label": "K34 (B3,D4)", "x": 3.75, "y": 3 },
-                { "label": "K35 (B3,C6)", "x": 4.75, "y": 3 },
-                { "label": "K36 (B3,D7)", "x": 5.75, "y": 3 },
-                { "label": "K37 (B3,E6)", "x": 6.75, "y": 3 },
-                { "label": "K38 (B3,B7)", "x": 7.75, "y": 3 },
-                { "label": "K39 (B3,F0)", "x": 8.75, "y": 3 },
-                { "label": "K3A (B3,F1)", "x": 9.75, "y": 3 },
-                { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
-                { "label": "K3C (B3,D6)", "x": 11.75, "y": 3 },
-                { "label": "K3D (B3,C7)", "x": 12.75, "y": 3, "w": 2.25 },
-                { "label": "K41 (B4,D2)", "x": 0, "y": 4, "w": 2.25 },
-                { "label": "K42 (B4,D1)", "x": 2.25, "y": 4 },
-                { "label": "K43 (B4,D0)", "x": 3.25, "y": 4 },
-                { "label": "K44 (B4,D4)", "x": 4.25, "y": 4 },
-                { "label": "K45 (B4,C6)", "x": 5.25, "y": 4 },
-                { "label": "K46 (B4,D7)", "x": 6.25, "y": 4 },
-                { "label": "K47 (B4,E6)", "x": 7.25, "y": 4 },
-                { "label": "K48 (B4,B7)", "x": 8.25, "y": 4 },
-                { "label": "K49 (B4,F0)", "x": 9.25, "y": 4 },
-                { "label": "K4A (B4,F1)", "x": 10.25, "y": 4 },
-                { "label": "K4B (B4,D5)", "x": 11.25, "y": 4 },
-                { "label": "K4D (B4,C7)", "x": 12.25, "y": 4, "w": 2.75 },
-                { "label": "K4G (B4,F7)", "x": 16.25, "y": 4 },
-                { "label": "K50 (B5,D3)", "x": 0, "y": 5, "w": 1.25 },
-                { "label": "K51 (B5,D2)", "x": 1.25, "y": 5, "w": 1.25 },
-                { "label": "K53 (B5,D0)", "x": 2.5, "y": 5, "w": 1.25 },
-                { "label": "K56 (B5,D7)", "x": 3.75, "y": 5, "w": 6.25 },
-                { "label": "K5A (B5,F1)", "x": 10, "y": 5, "w": 1.25 },
-                { "label": "K5B (B5,D5)", "x": 11.25, "y": 5, "w": 1.25 },
-                { "label": "K5D (B5,C7)", "x": 12.5, "y": 5, "w": 1.25 },
-                { "label": "K5E (B5,E2)", "x": 13.75, "y": 5, "w": 1.25 },
-                { "label": "K5F (B5,B6)", "x": 15.25, "y": 5 },
-                { "label": "K5G (B5,F7)", "x": 16.25, "y": 5 },
-                { "label": "K5H (B5,F6)", "x": 17.25, "y": 5 }
+                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "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": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+                {"matrix": [1, 16], "x": 16.25, "y": 1},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+                {"matrix": [2, 16], "x": 16.25, "y": 2},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5},
+                {"matrix": [5, 16], "x": 16.25, "y": 5},
+                {"matrix": [5, 17], "x": 17.25, "y": 5}
             ]
         }
     }
-
 }