Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 116 insertions, 106 deletions

diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index bb42d48981..bcf466cea4 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -21,61 +21,125 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0.25, "y":0},
-                {"label":"L01", "x":1.25, "y":0},
-                {"label":"L02", "x":2.25, "y":0},
-                {"label":"L03", "x":3.25, "y":0},
-                {"label":"L04", "x":4.25, "y":0},
-                {"label":"L05", "x":5.25, "y":0},
-                {"label":"L06", "x":6.25, "y":0},
-                {"label":"R00", "x":9.25, "y":0},
-                {"label":"R01", "x":10.25, "y":0},
-                {"label":"R02", "x":11.25, "y":0},
-                {"label":"R03", "x":12.25, "y":0},
-                {"label":"R04", "x":13.25, "y":0},
-                {"label":"R05", "x":14.25, "y":0},
-                {"label":"R06", "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
 
-                {"label":"L11", "x":0.25, "y":1, "w":1.75},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3.25, "y":1},
-                {"label":"L14", "x":4.25, "y":1},
-                {"label":"L15", "x":5.25, "y":1},
-                {"label":"L16", "x":6.25, "y":1},
-                {"label":"R10", "x":9.25, "y":1},
-                {"label":"R11", "x":10.25, "y":1},
-                {"label":"R12", "x":11.25, "y":1},
-                {"label":"R13", "x":12.25, "y":1},
-                {"label":"R14", "x":13.5, "y":1},
-                {"label":"R15", "x":14.5, "y":1},
-                {"label":"R16", "x":15.5, "y":1},
+                {"matrix": [4, 0], "x": 9.25, "y": 0},
+                {"matrix": [4, 1], "x": 10.25, "y": 0},
+                {"matrix": [4, 2], "x": 11.25, "y": 0},
+                {"matrix": [4, 3], "x": 12.25, "y": 0},
+                {"matrix": [4, 4], "x": 13.25, "y": 0},
+                {"matrix": [4, 5], "x": 14.25, "y": 0},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
 
-                {"label":"L21", "x":0, "y":2, "w":1.75},
-                {"label":"L22", "x":1.75, "y":2},
-                {"label":"L23", "x":3.25, "y":2},
-                {"label":"L24", "x":4.25, "y":2},
-                {"label":"L25", "x":5.25, "y":2},
-                {"label":"L26", "x":6.25, "y":2},
-                {"label":"L20", "x":7.75, "y":2},
-                {"label":"R20", "x":9.25, "y":2},
-                {"label":"R21", "x":10.25, "y":2},
-                {"label":"R22", "x":11.25, "y":2},
-                {"label":"R23", "x":12.25, "y":2},
-                {"label":"R24", "x":13.75, "y":2},
-                {"label":"R25", "x":14.75, "y":2},
-                {"label":"R26", "x":15.75, "y":2},
+                {"matrix": [1, 1], "x": 0.25, "y": 1, "w": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
 
-                {"label":"L31", "x":0.25, "y":3, "w":1.25},
-                {"label":"L32", "x":1.5, "y":3, "w":1.25},
-                {"label":"L34", "x":4.125, "y":3, "w":1.25},
-                {"label":"L35", "x":5.375, "y":3, "w":1.25},
-                {"label":"L36", "x":6.625, "y":3},
-                {"label":"R30", "x":8.875, "y":3},
-                {"label":"R31", "x":9.875, "y":3, "w":1.25},
-                {"label":"R32", "x":11.125, "y":3, "w":1.25},
-                {"label":"R34", "x":13.75, "y":3},
-                {"label":"R35", "x":14.75, "y":3},
-                {"label":"R36", "x":15.75, "y":3}
+                {"matrix": [5, 0], "x": 9.25, "y": 1},
+                {"matrix": [5, 1], "x": 10.25, "y": 1},
+                {"matrix": [5, 2], "x": 11.25, "y": 1},
+                {"matrix": [5, 3], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 13.5, "y": 1},
+                {"matrix": [5, 5], "x": 14.5, "y": 1},
+                {"matrix": [5, 6], "x": 15.5, "y": 1},
+
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 0], "x": 7.75, "y": 2},
+
+                {"matrix": [6, 0], "x": 9.25, "y": 2},
+                {"matrix": [6, 1], "x": 10.25, "y": 2},
+                {"matrix": [6, 2], "x": 11.25, "y": 2},
+                {"matrix": [6, 3], "x": 12.25, "y": 2},
+                {"matrix": [6, 4], "x": 13.75, "y": 2},
+                {"matrix": [6, 5], "x": 14.75, "y": 2},
+                {"matrix": [6, 6], "x": 15.75, "y": 2},
+
+                {"matrix": [3, 1], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4.125, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5.375, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6.625, "y": 3},
+
+                {"matrix": [7, 0], "x": 8.875, "y": 3},
+                {"matrix": [7, 1], "x": 9.875, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 11.125, "y": 3, "w": 1.25},
+
+                {"matrix": [7, 4], "x": 13.75, "y": 3},
+                {"matrix": [7, 5], "x": 14.75, "y": 3},
+                {"matrix": [7, 6], "x": 15.75, "y": 3}
+            ]
+        },
+        "LAYOUT_rotary_layer": {
+            "layout": [
+                {"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": [4, 0], "x": 7, "y": 0},
+                {"matrix": [4, 1], "x": 8, "y": 0},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0},
+                {"matrix": [4, 4], "x": 11, "y": 0},
+                {"matrix": [4, 5], "x": 12, "y": 0},
+                {"matrix": [4, 6], "x": 13, "y": 0},
+                {"matrix": [1, 1], "x": 14, "y": 0},
+                {"matrix": [1, 2], "x": 15, "y": 0},
+                {"matrix": [1, 3], "x": 16, "y": 0},
+                {"matrix": [1, 4], "x": 17, "y": 0},
+                {"matrix": [1, 5], "x": 18, "y": 0},
+                {"matrix": [1, 6], "x": 19, "y": 0},
+                {"matrix": [1, 0], "x": 20, "y": 0},
+                {"matrix": [5, 0], "x": 21, "y": 0},
+                {"matrix": [5, 1], "x": 22, "y": 0},
+                {"matrix": [5, 2], "x": 23, "y": 0},
+                {"matrix": [5, 3], "x": 24, "y": 0},
+                {"matrix": [5, 4], "x": 25, "y": 0},
+                {"matrix": [5, 5], "x": 26, "y": 0},
+                {"matrix": [5, 6], "x": 27, "y": 0},
+                {"matrix": [2, 1], "x": 28, "y": 0},
+                {"matrix": [2, 2], "x": 29, "y": 0},
+                {"matrix": [2, 3], "x": 30, "y": 0},
+                {"matrix": [2, 4], "x": 31, "y": 0},
+                {"matrix": [2, 5], "x": 32, "y": 0},
+                {"matrix": [2, 6], "x": 33, "y": 0},
+                {"matrix": [2, 0], "x": 34, "y": 0},
+                {"matrix": [6, 0], "x": 35, "y": 0},
+                {"matrix": [6, 1], "x": 36, "y": 0},
+                {"matrix": [6, 2], "x": 37, "y": 0},
+                {"matrix": [6, 3], "x": 38, "y": 0},
+                {"matrix": [6, 4], "x": 39, "y": 0},
+                {"matrix": [6, 5], "x": 40, "y": 0},
+                {"matrix": [6, 6], "x": 41, "y": 0},
+                {"matrix": [3, 1], "x": 42, "y": 0},
+                {"matrix": [3, 2], "x": 43, "y": 0},
+                {"matrix": [3, 4], "x": 44, "y": 0},
+                {"matrix": [3, 5], "x": 45, "y": 0},
+                {"matrix": [3, 6], "x": 46, "y": 0},
+                {"matrix": [3, 0], "x": 47, "y": 0},
+                {"matrix": [7, 0], "x": 48, "y": 0},
+                {"matrix": [7, 1], "x": 49, "y": 0},
+                {"matrix": [7, 2], "x": 50, "y": 0},
+                {"matrix": [7, 4], "x": 51, "y": 0},
+                {"matrix": [7, 5], "x": 52, "y": 0},
+                {"matrix": [7, 6], "x": 53, "y": 0}
             ]
         }
     }
diff --git a/keyboards/gl516/n51gl/n51gl.h b/keyboards/gl516/n51gl/n51gl.h
deleted file mode 100644
index 6429b78fd0..0000000000
--- a/keyboards/gl516/n51gl/n51gl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-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"
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06,      R00, R01, R02, R03, R04, R05, R06, \
-         L11, L12, L13, L14, L15, L16,      R10, R11, R12, R13, R14, R15, R16, \
-         L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
-         L31, L32,      L34, L35, L36,      R30, R31, R32,      R34, R35, R36  \
-  ) \
-  { \
-    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
-    { KC_NO,   L11,   L12,   L13,   L14,   L15,   L16 }, \
-    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
-    { KC_NO,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
-    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
-    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
-    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
-    {   R30,   R31,   R32, KC_NO,   R34,   R35,   R36 }  \
-  }
-
-#define LAYOUT_rotary_layer( \
-    L00, L01, L02, L03, L04, L05, L06,      R00, R01, R02, R03, R04, R05, R06, \
-         L11, L12, L13, L14, L15, L16, L10, R10, R11, R12, R13, R14, R15, R16, \
-         L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
-         L31, L32,      L34, L35, L36, L30, R30, R31, R32,      R34, R35, R36  \
-  ) \
-  { \
-    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
-    {   L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
-    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
-    {   L30,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
-    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
-    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
-    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
-    {   R30,   R31,   R32, KC_NO,   R34,   R35,   R36 }  \
-  }