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

2 files changed, 80 insertions, 97 deletions

diff --git a/keyboards/sekigon/grs_70ec/grs_70ec.h b/keyboards/sekigon/grs_70ec/grs_70ec.h
index 7b2b0c596c..9f0c9e2545 100644
--- a/keyboards/sekigon/grs_70ec/grs_70ec.h
+++ b/keyboards/sekigon/grs_70ec/grs_70ec.h
@@ -20,30 +20,3 @@
 
 void led_on(void);
 void led_off(void);
-
-/* 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( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
-         L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
-         L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R27, \
-    L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37, \
-    L40,      L42, L43,      L45, L46, R40, R41, R42, R43,      R45, R46, R47  \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \
-    { KC_NO, L11, L12, L13, L14, L15, L16, KC_NO }, \
-    { KC_NO, L21, L22, L23, L24, L25, L26, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \
-    { L40, KC_NO, L42, L43, KC_NO, L45, L46, KC_NO }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-    { R40, R41, R42, R43, KC_NO, R45, R46, R47 } \
-}
diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json
index 44a9e30493..c213e1e26f 100644
--- a/keyboards/sekigon/grs_70ec/info.json
+++ b/keyboards/sekigon/grs_70ec/info.json
@@ -16,76 +16,86 @@
     "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": "k50", "x": 7.75, "y": 0 },
-                { "label": "k51", "x": 8.75, "y": 0 },
-                { "label": "k52", "x": 9.75, "y": 0 },
-                { "label": "k53", "x": 10.75, "y": 0 },
-                { "label": "k54", "x": 11.75, "y": 0 },
-                { "label": "k55", "x": 12.75, "y": 0 },
-                { "label": "k56", "x": 13.75, "y": 0 },
-                { "label": "k57", "x": 14.75, "y": 0 },
-                { "label": "k11", "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": "k60", "x": 7.25, "y": 1 },
-                { "label": "k61", "x": 8.25, "y": 1 },
-                { "label": "k62", "x": 9.25, "y": 1 },
-                { "label": "k63", "x": 10.25, "y": 1 },
-                { "label": "k64", "x": 11.25, "y": 1 },
-                { "label": "k65", "x": 12.25, "y": 1 },
-                { "label": "k66", "x": 13.25, "y": 1 },
-                { "label": "k67", "x": 14.25, "y": 1, "w": 1.5 },
-                { "label": "k21", "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": "k70", "x": 7.5, "y": 2 },
-                { "label": "k71", "x": 8.5, "y": 2 },
-                { "label": "k72", "x": 9.5, "y": 2 },
-                { "label": "k73", "x": 10.5, "y": 2 },
-                { "label": "k74", "x": 11.5, "y": 2 },
-                { "label": "k75", "x": 12.5, "y": 2 },
-                { "label": "k76", "x": 13.5, "y": 2 },
-                { "label": "k77", "x": 14.5, "y": 2 },
-                { "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": "k80", "x": 7.75, "y": 3 },
-                { "label": "k81", "x": 8.75, "y": 3 },
-                { "label": "k82", "x": 9.75, "y": 3 },
-                { "label": "k83", "x": 10.75, "y": 3 },
-                { "label": "k84", "x": 11.75, "y": 3 },
-                { "label": "k85", "x": 12.75, "y": 3 },
-                { "label": "k86", "x": 13.75, "y": 3 },
-                { "label": "k87", "x": 14.75, "y": 3 },
-                { "label": "k40", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "k42", "x": 2, "y": 4 },
-                { "label": "k43", "x": 3, "y": 4, "w": 1.25 },
-                { "label": "k45", "x": 4.25, "y": 4, "w": 1.25 },
-                { "label": "k46", "x": 5.5, "y": 4, "w": 1.25 },
-                { "label": "k90", "x": 7.5, "y": 4, "w": 1.25 },
-                { "label": "k91", "x": 8.75, "y": 4, "w": 1.25 },
-                { "label": "k92", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "k93", "x": 11.25, "y": 4 },
-                { "label": "k95", "x": 12.75, "y": 4 },
-                { "label": "k96", "x": 13.75, "y": 4 },
-                { "label": "k97", "x": 14.75, "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": [5, 0], "x": 7.75, "y": 0},
+                {"matrix": [5, 1], "x": 8.75, "y": 0},
+                {"matrix": [5, 2], "x": 9.75, "y": 0},
+                {"matrix": [5, 3], "x": 10.75, "y": 0},
+                {"matrix": [5, 4], "x": 11.75, "y": 0},
+                {"matrix": [5, 5], "x": 12.75, "y": 0},
+                {"matrix": [5, 6], "x": 13.75, "y": 0},
+                {"matrix": [5, 7], "x": 14.75, "y": 0},
+
+                {"matrix": [1, 1], "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": [6, 0], "x": 7.25, "y": 1},
+                {"matrix": [6, 1], "x": 8.25, "y": 1},
+                {"matrix": [6, 2], "x": 9.25, "y": 1},
+                {"matrix": [6, 3], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 5], "x": 12.25, "y": 1},
+                {"matrix": [6, 6], "x": 13.25, "y": 1},
+                {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "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": [7, 0], "x": 7.5, "y": 2},
+                {"matrix": [7, 1], "x": 8.5, "y": 2},
+                {"matrix": [7, 2], "x": 9.5, "y": 2},
+                {"matrix": [7, 3], "x": 10.5, "y": 2},
+                {"matrix": [7, 4], "x": 11.5, "y": 2},
+                {"matrix": [7, 5], "x": 12.5, "y": 2},
+                {"matrix": [7, 6], "x": 13.5, "y": 2},
+                {"matrix": [7, 7], "x": 14.5, "y": 2},
+
+                {"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": [8, 0], "x": 7.75, "y": 3},
+                {"matrix": [8, 1], "x": 8.75, "y": 3},
+                {"matrix": [8, 2], "x": 9.75, "y": 3},
+                {"matrix": [8, 3], "x": 10.75, "y": 3},
+                {"matrix": [8, 4], "x": 11.75, "y": 3},
+                {"matrix": [8, 5], "x": 12.75, "y": 3},
+                {"matrix": [8, 6], "x": 13.75, "y": 3},
+                {"matrix": [8, 7], "x": 14.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4},
+
+                {"matrix": [9, 5], "x": 12.75, "y": 4},
+                {"matrix": [9, 6], "x": 13.75, "y": 4},
+                {"matrix": [9, 7], "x": 14.75, "y": 4}
             ]
         }
     }