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

2 files changed, 91 insertions, 116 deletions

diff --git a/keyboards/amjkeyboard/amj84/amj84.h b/keyboards/amjkeyboard/amj84/amj84.h
deleted file mode 100644
index 19718da8cd..0000000000
--- a/keyboards/amjkeyboard/amj84/amj84.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* 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, 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, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
-    K50, K51, K52,           K55,           K58, K59, K5A, K5B, K5C, K5D, K5E \
-) { \
-    { 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, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52,KC_NO,KC_NO,K55,KC_NO,KC_NO,K58,K59,K5A, K5B, K5C, K5D, K5E }  \
-}
diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
index aeb6194445..26a3fad1bc 100644
--- a/keyboards/amjkeyboard/amj84/info.json
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -22,92 +22,97 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "x": 15, "y": 0 },
-                { "x": 0, "y": 1 },
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
-                { "x": 4, "y": 1 },
-                { "x": 5, "y": 1 },
-                { "x": 6, "y": 1 },
-                { "x": 7, "y": 1 },
-                { "x": 8, "y": 1 },
-                { "x": 9, "y": 1 },
-                { "x": 10, "y": 1 },
-                { "x": 11, "y": 1 },
-                { "x": 12, "y": 1 },
-                { "w": 2, "x": 13, "y": 1 },
-                { "x": 15, "y": 1 },
-                { "w": 1.5, "x": 0, "y": 2 },
-                { "x": 1.5, "y": 2 },
-                { "x": 2.5, "y": 2 },
-                { "x": 3.5, "y": 2 },
-                { "x": 4.5, "y": 2 },
-                { "x": 5.5, "y": 2 },
-                { "x": 6.5, "y": 2 },
-                { "x": 7.5, "y": 2 },
-                { "x": 8.5, "y": 2 },
-                { "x": 9.5, "y": 2 },
-                { "x": 10.5, "y": 2 },
-                { "x": 11.5, "y": 2 },
-                { "x": 12.5, "y": 2 },
-                { "w": 1.5, "x": 13.5, "y": 2 },
-                { "x": 15, "y": 2 },
-                { "w": 1.75, "x": 0, "y": 3 },
-                { "x": 1.75, "y": 3 },
-                { "x": 2.75, "y": 3 },
-                { "x": 3.75, "y": 3 },
-                { "x": 4.75, "y": 3 },
-                { "x": 5.75, "y": 3 },
-                { "x": 6.75, "y": 3 },
-                { "x": 7.75, "y": 3 },
-                { "x": 8.75, "y": 3 },
-                { "x": 9.75, "y": 3 },
-                { "x": 10.75, "y": 3 },
-                { "x": 11.75, "y": 3 },
-                { "x": 12.75, "y": 3 },
-                { "w": 1.25, "x": 13.75, "y": 3 },
-                { "x": 15, "y": 3 },
-                { "w": 2.25, "x": 0, "y": 4 },
-                { "x": 2.25, "y": 4 },
-                { "x": 3.25, "y": 4 },
-                { "x": 4.25, "y": 4 },
-                { "x": 5.25, "y": 4 },
-                { "x": 6.25, "y": 4 },
-                { "x": 7.25, "y": 4 },
-                { "x": 8.25, "y": 4 },
-                { "x": 9.25, "y": 4 },
-                { "x": 10.25, "y": 4 },
-                { "x": 11.25, "y": 4 },
-                { "w": 1.75, "x": 12.25, "y": 4 },
-                { "x": 14, "y": 4 },
-                { "x": 15, "y": 4 },
-                { "w": 1.25, "x": 0, "y": 5 },
-                { "w": 1.25, "x": 1.25, "y": 5 },
-                { "w": 1.25, "x": 2.5, "y": 5 },
-                { "w": 5.25, "x": 3.75, "y": 5 },
-                { "x": 9, "y": 5 },
-                { "x": 10, "y": 5 },
-                { "x": 11, "y": 5 },
-                { "x": 12, "y": 5 },
-                { "x": 13, "y": 5 },
-                { "x": 14, "y": 5 },
-                { "x": 15, "y": 5 }
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
+
+                {"label": "K11", "matrix": [1, 1], "x": 0, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 1, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 2, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 3, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 4, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 6, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 7, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 8, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 9, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 10, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 11, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 12, "y": 1},
+                {"label": "K1E", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "K20", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "K21", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.5},
+                {"label": "K22", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "K2C", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "K30", "matrix": [3, 0], "x": 15, "y": 2},
+
+                {"label": "K31", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.75},
+                {"label": "K32", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "K3D", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+                {"label": "K40", "matrix": [4, 0], "x": 15, "y": 3},
+
+                {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "K43", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "K44", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "K45", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "K46", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "K47", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "K48", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "K49", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4},
+
+                {"label": "K50", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "K51", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "K52", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "K55", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 5.25},
+                {"label": "K58", "matrix": [5, 8], "x": 9, "y": 5},
+                {"label": "K59", "matrix": [5, 9], "x": 10, "y": 5},
+                {"label": "K5A", "matrix": [5, 10], "x": 11, "y": 5},
+                {"label": "K5B", "matrix": [5, 11], "x": 12, "y": 5},
+                {"label": "K5C", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "K5D", "matrix": [5, 13], "x": 14, "y": 5},
+                {"label": "K5E", "matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }