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

3 files changed, 170 insertions, 171 deletions

diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index b93857eb51..b0b8fc12d0 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -32,80 +32,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0, "w":1.5},
-                {"label":"L01", "x":1.5, "y":0},
-                {"label":"L02", "x":2.5, "y":0},
-                {"label":"L03", "x":3.5, "y":0},
-                {"label":"L04", "x":4.5, "y":0},
-                {"label":"L05", "x":5.5, "y":0},
-                {"label":"L06", "x":6.75, "y":0},
-                {"label":"R06", "x":9.25, "y":0},
-                {"label":"R00", "x":10.5, "y":0},
-                {"label":"R01", "x":11.5, "y":0},
-                {"label":"R02", "x":12.5, "y":0},
-                {"label":"R03", "x":13.5, "y":0},
-                {"label":"R04", "x":14.5, "y":0},
-                {"label":"R05", "x":15.5, "y":0, "w":1.5},
-                {"label":"L10", "x":0, "y":1, "w":1.5},
-                {"label":"L11", "x":1.5, "y":1},
-                {"label":"L12", "x":2.5, "y":1},
-                {"label":"L13", "x":3.5, "y":1},
-                {"label":"L14", "x":4.5, "y":1},
-                {"label":"L15", "x":5.5, "y":1},
-                {"label":"L16", "x":6.75, "y":1},
-                {"label":"R16", "x":9.25, "y":1},
-                {"label":"R10", "x":10.5, "y":1},
-                {"label":"R11", "x":11.5, "y":1},
-                {"label":"R12", "x":12.5, "y":1},
-                {"label":"R13", "x":13.5, "y":1},
-                {"label":"R14", "x":14.5, "y":1},
-                {"label":"R15", "x":15.5, "y":1, "w":1.5},
-                {"label":"L20", "x":0, "y":2, "w":1.5},
-                {"label":"L21", "x":1.5, "y":2},
-                {"label":"L22", "x":2.5, "y":2},
-                {"label":"L23", "x":3.5, "y":2},
-                {"label":"L24", "x":4.5, "y":2},
-                {"label":"L25", "x":5.5, "y":2},
-                {"label":"L26", "x":6.75, "y":2},
-                {"label":"R26", "x":9.25, "y":2},
-                {"label":"R20", "x":10.5, "y":2},
-                {"label":"R21", "x":11.5, "y":2},
-                {"label":"R22", "x":12.5, "y":2},
-                {"label":"R23", "x":13.5, "y":2},
-                {"label":"R24", "x":14.5, "y":2},
-                {"label":"R25", "x":15.5, "y":2, "w":1.5},
-                {"label":"L30", "x":0, "y":3, "w":1.5},
-                {"label":"L31", "x":1.5, "y":3},
-                {"label":"L32", "x":2.5, "y":3},
-                {"label":"L33", "x":3.5, "y":3},
-                {"label":"L34", "x":4.5, "y":3},
-                {"label":"L35", "x":5.5, "y":3},
-                {"label":"L36", "x":6.75, "y":3},
-                {"label":"R36", "x":9.25, "y":3},
-                {"label":"R30", "x":10.5, "y":3},
-                {"label":"R31", "x":11.5, "y":3},
-                {"label":"R32", "x":12.5, "y":3},
-                {"label":"R33", "x":13.5, "y":3},
-                {"label":"R34", "x":14.5, "y":3},
-                {"label":"R35", "x":15.5, "y":3, "w":1.5},
-                {"label":"L40", "x":0, "y":4, "w":1.5},
-                {"label":"L41", "x":1.5, "y":4},
-                {"label":"L42", "x":2.5, "y":4},
-                {"label":"L43", "x":3.5, "y":4},
-                {"label":"L44", "x":4.5, "y":4},
-                {"label":"L45", "x":6, "y":4.5},
-                {"label":"L46", "x":7, "y":4.5},
-                {"label":"R46", "x":9, "y":4.5},
-                {"label":"R40", "x":10, "y":4.5},
-                {"label":"R41", "x":11.5, "y":4},
-                {"label":"R42", "x":12.5, "y":4},
-                {"label":"R43", "x":13.5, "y":4},
-                {"label":"R44", "x":14.5, "y":4},
-                {"label":"R45", "x":15.5, "y":4, "w":1.5},
-                {"label":"L55", "x":6, "y":5.5},
-                {"label":"L56", "x":7, "y":5.5},
-                {"label":"R56", "x":9, "y":5.5},
-                {"label":"R50", "x":10, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+                {"matrix": [6, 6], "x": 9.25, "y": 0},
+                {"matrix": [6, 5], "x": 10.5, "y": 0},
+                {"matrix": [6, 4], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0},
+                {"matrix": [6, 1], "x": 14.5, "y": 0},
+                {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5},
+
+                {"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": 6.75, "y": 1},
+
+                {"matrix": [7, 6], "x": 9.25, "y": 1},
+                {"matrix": [7, 5], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1},
+                {"matrix": [7, 1], "x": 14.5, "y": 1},
+                {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+
+                {"matrix": [8, 6], "x": 9.25, "y": 2},
+                {"matrix": [8, 5], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2},
+                {"matrix": [8, 1], "x": 14.5, "y": 2},
+                {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [9, 5], "x": 10.5, "y": 3},
+                {"matrix": [9, 4], "x": 11.5, "y": 3},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 1], "x": 14.5, "y": 3},
+                {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4.5},
+                {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+                {"matrix": [10, 6], "x": 9, "y": 4.5},
+                {"matrix": [10, 5], "x": 10, "y": 4.5},
+                {"matrix": [10, 4], "x": 11.5, "y": 4},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4},
+                {"matrix": [10, 1], "x": 14.5, "y": 4},
+                {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+                {"matrix": [5, 5], "x": 6, "y": 5.5},
+                {"matrix": [5, 6], "x": 7, "y": 5.5},
+
+                {"matrix": [11, 6], "x": 9, "y": 5.5},
+                {"matrix": [11, 5], "x": 10, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index 2daee64be4..1eec8a3930 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -27,80 +27,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0, "w":1.5},
-                {"label":"L01", "x":1.5, "y":0},
-                {"label":"L02", "x":2.5, "y":0},
-                {"label":"L03", "x":3.5, "y":0},
-                {"label":"L04", "x":4.5, "y":0},
-                {"label":"L05", "x":5.5, "y":0},
-                {"label":"L06", "x":6.75, "y":0},
-                {"label":"R06", "x":9.25, "y":0},
-                {"label":"R00", "x":10.5, "y":0},
-                {"label":"R01", "x":11.5, "y":0},
-                {"label":"R02", "x":12.5, "y":0},
-                {"label":"R03", "x":13.5, "y":0},
-                {"label":"R04", "x":14.5, "y":0},
-                {"label":"R05", "x":15.5, "y":0, "w":1.5},
-                {"label":"L10", "x":0, "y":1, "w":1.5},
-                {"label":"L11", "x":1.5, "y":1},
-                {"label":"L12", "x":2.5, "y":1},
-                {"label":"L13", "x":3.5, "y":1},
-                {"label":"L14", "x":4.5, "y":1},
-                {"label":"L15", "x":5.5, "y":1},
-                {"label":"L16", "x":6.75, "y":1},
-                {"label":"R16", "x":9.25, "y":1},
-                {"label":"R10", "x":10.5, "y":1},
-                {"label":"R11", "x":11.5, "y":1},
-                {"label":"R12", "x":12.5, "y":1},
-                {"label":"R13", "x":13.5, "y":1},
-                {"label":"R14", "x":14.5, "y":1},
-                {"label":"R15", "x":15.5, "y":1, "w":1.5},
-                {"label":"L20", "x":0, "y":2, "w":1.5},
-                {"label":"L21", "x":1.5, "y":2},
-                {"label":"L22", "x":2.5, "y":2},
-                {"label":"L23", "x":3.5, "y":2},
-                {"label":"L24", "x":4.5, "y":2},
-                {"label":"L25", "x":5.5, "y":2},
-                {"label":"L26", "x":6.75, "y":2},
-                {"label":"R26", "x":9.25, "y":2},
-                {"label":"R20", "x":10.5, "y":2},
-                {"label":"R21", "x":11.5, "y":2},
-                {"label":"R22", "x":12.5, "y":2},
-                {"label":"R23", "x":13.5, "y":2},
-                {"label":"R24", "x":14.5, "y":2},
-                {"label":"R25", "x":15.5, "y":2, "w":1.5},
-                {"label":"L30", "x":0, "y":3, "w":1.5},
-                {"label":"L31", "x":1.5, "y":3},
-                {"label":"L32", "x":2.5, "y":3},
-                {"label":"L33", "x":3.5, "y":3},
-                {"label":"L34", "x":4.5, "y":3},
-                {"label":"L35", "x":5.5, "y":3},
-                {"label":"L36", "x":6.75, "y":3},
-                {"label":"R36", "x":9.25, "y":3},
-                {"label":"R30", "x":10.5, "y":3},
-                {"label":"R31", "x":11.5, "y":3},
-                {"label":"R32", "x":12.5, "y":3},
-                {"label":"R33", "x":13.5, "y":3},
-                {"label":"R34", "x":14.5, "y":3},
-                {"label":"R35", "x":15.5, "y":3, "w":1.5},
-                {"label":"L40", "x":0, "y":4, "w":1.5},
-                {"label":"L41", "x":1.5, "y":4},
-                {"label":"L42", "x":2.5, "y":4},
-                {"label":"L43", "x":3.5, "y":4},
-                {"label":"L44", "x":4.5, "y":4},
-                {"label":"L45", "x":6, "y":4.5},
-                {"label":"L46", "x":7, "y":4.5},
-                {"label":"R46", "x":9, "y":4.5},
-                {"label":"R40", "x":10, "y":4.5},
-                {"label":"R41", "x":11.5, "y":4},
-                {"label":"R42", "x":12.5, "y":4},
-                {"label":"R43", "x":13.5, "y":4},
-                {"label":"R44", "x":14.5, "y":4},
-                {"label":"R45", "x":15.5, "y":4, "w":1.5},
-                {"label":"L55", "x":6, "y":5.5},
-                {"label":"L56", "x":7, "y":5.5},
-                {"label":"R56", "x":9, "y":5.5},
-                {"label":"R50", "x":10, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+
+                {"matrix": [6, 6], "x": 9.25, "y": 0},
+                {"matrix": [6, 5], "x": 10.5, "y": 0},
+                {"matrix": [6, 4], "x": 11.5, "y": 0},
+                {"matrix": [6, 3], "x": 12.5, "y": 0},
+                {"matrix": [6, 2], "x": 13.5, "y": 0},
+                {"matrix": [6, 1], "x": 14.5, "y": 0},
+                {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5},
+
+                {"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": 6.75, "y": 1},
+
+                {"matrix": [7, 6], "x": 9.25, "y": 1},
+                {"matrix": [7, 5], "x": 10.5, "y": 1},
+                {"matrix": [7, 4], "x": 11.5, "y": 1},
+                {"matrix": [7, 3], "x": 12.5, "y": 1},
+                {"matrix": [7, 2], "x": 13.5, "y": 1},
+                {"matrix": [7, 1], "x": 14.5, "y": 1},
+                {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+
+                {"matrix": [8, 6], "x": 9.25, "y": 2},
+                {"matrix": [8, 5], "x": 10.5, "y": 2},
+                {"matrix": [8, 4], "x": 11.5, "y": 2},
+                {"matrix": [8, 3], "x": 12.5, "y": 2},
+                {"matrix": [8, 2], "x": 13.5, "y": 2},
+                {"matrix": [8, 1], "x": 14.5, "y": 2},
+                {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.25, "y": 3},
+                {"matrix": [9, 5], "x": 10.5, "y": 3},
+                {"matrix": [9, 4], "x": 11.5, "y": 3},
+                {"matrix": [9, 3], "x": 12.5, "y": 3},
+                {"matrix": [9, 2], "x": 13.5, "y": 3},
+                {"matrix": [9, 1], "x": 14.5, "y": 3},
+                {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4.5},
+                {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+                {"matrix": [10, 6], "x": 9, "y": 4.5},
+                {"matrix": [10, 5], "x": 10, "y": 4.5},
+                {"matrix": [10, 4], "x": 11.5, "y": 4},
+                {"matrix": [10, 3], "x": 12.5, "y": 4},
+                {"matrix": [10, 2], "x": 13.5, "y": 4},
+                {"matrix": [10, 1], "x": 14.5, "y": 4},
+                {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5},
+
+                {"matrix": [5, 5], "x": 6, "y": 5.5},
+                {"matrix": [5, 6], "x": 7, "y": 5.5},
+
+                {"matrix": [11, 6], "x": 9, "y": 5.5},
+                {"matrix": [11, 5], "x": 10, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h
index 695dc6db61..2cab481044 100644
--- a/keyboards/rgbkb/sol/sol.h
+++ b/keyboards/rgbkb/sol/sol.h
@@ -2,29 +2,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15, L16, R16, R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25, \
-  L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
-  L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45, \
-                           L55, L56, R56, R50 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55, L56 }, \
-    { R05, R04, R03, R02, R01, R00, R06 }, \
-    { R15, R14, R13, R12, R11, R10, R16 }, \
-    { R25, R24, R23, R22, R21, R20, R26 }, \
-    { R35, R34, R33, R32, R31, R30, R36 }, \
-    { R45, R44, R43, R42, R41, R40, R46 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R50, R56 } \
-  }
-
 #define ENCODER_LAYOUT( \
   E10, E11, \
   E20, E21 \