Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 74 insertions, 106 deletions

diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index d91101d107..bdc72025a2 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -25,76 +25,80 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (F6,B2)", "x": 0, "y": 0 },
-                { "label": "K01 (F6,B5)", "x": 1, "y": 0 },
-                { "label": "K02 (F6,F5)", "x": 2, "y": 0 },
-                { "label": "K03 (F6,C7)", "x": 3, "y": 0 },
-                { "label": "K04 (F6,B4)", "x": 4, "y": 0 },
-                { "label": "K05 (F6,C6)", "x": 5, "y": 0 },
-                { "label": "K06 (F6,D7)", "x": 6, "y": 0 },
-                { "label": "K07 (F6,D6)", "x": 7, "y": 0 },
-                { "label": "K08 (F6,D4)", "x": 8, "y": 0 },
-                { "label": "K09 (F6,D5)", "x": 9, "y": 0 },
-                { "label": "K0A (F6,D3)", "x": 10, "y": 0 },
-                { "label": "K0B (F6,D2)", "x": 11, "y": 0 },
-                { "label": "K0C (F6,B6)", "x": 12, "y": 0 },
-                { "label": "K0D (F6,D1)", "x": 13, "y": 0 },
-                { "label": "K2C (F4,B6)", "x": 14, "y": 0 },
-                { "label": "K0E (F6,D0)", "x": 15, "y": 0 },
-                { "label": "K10 (F7,B2)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11 (F7,B5)", "x": 1.5, "y": 1 },
-                { "label": "K12 (F7,F5)", "x": 2.5, "y": 1 },
-                { "label": "K13 (F7,C7)", "x": 3.5, "y": 1 },
-                { "label": "K14 (F7,B4)", "x": 4.5, "y": 1 },
-                { "label": "K15 (F7,C6)", "x": 5.5, "y": 1 },
-                { "label": "K16 (F7,D7)", "x": 6.5, "y": 1 },
-                { "label": "K17 (F7,D6)", "x": 7.5, "y": 1 },
-                { "label": "K18 (F7,D4)", "x": 8.5, "y": 1 },
-                { "label": "K19 (F7,D5)", "x": 9.5, "y": 1 },
-                { "label": "K1A (F7,D3)", "x": 10.5, "y": 1 },
-                { "label": "K1B (F7,D2)", "x": 11.5, "y": 1 },
-                { "label": "K1C (F7,B6)", "x": 12.5, "y": 1 },
-                { "label": "K1D (F7,D1)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (F7,D0)", "x": 15, "y": 1 },
-                { "label": "K20 (F4,B2)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (F4,B5)", "x": 1.75, "y": 2 },
-                { "label": "K22 (F4,F5)", "x": 2.75, "y": 2 },
-                { "label": "K23 (F4,C7)", "x": 3.75, "y": 2 },
-                { "label": "K24 (F4,B4)", "x": 4.75, "y": 2 },
-                { "label": "K25 (F4,C6)", "x": 5.75, "y": 2 },
-                { "label": "K26 (F4,D7)", "x": 6.75, "y": 2 },
-                { "label": "K27 (F4,D6)", "x": 7.75, "y": 2 },
-                { "label": "K28 (F4,D4)", "x": 8.75, "y": 2 },
-                { "label": "K29 (F4,D5)", "x": 9.75, "y": 2 },
-                { "label": "K2A (F4,D3)", "x": 10.75, "y": 2 },
-                { "label": "K2B (F4,D2)", "x": 11.75, "y": 2 },
-                { "label": "K2D (F4,D1)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2E (F4,D0)", "x": 15, "y": 2 },
-                { "label": "K30 (B0,B2)", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "K31 (B0,B5)", "x": 1.25, "y": 3 },
-                { "label": "K32 (B0,F5)", "x": 2.25, "y": 3 },
-                { "label": "K33 (B0,C7)", "x": 3.25, "y": 3 },
-                { "label": "K34 (B0,B4)", "x": 4.25, "y": 3 },
-                { "label": "K35 (B0,C6)", "x": 5.25, "y": 3 },
-                { "label": "K36 (B0,D7)", "x": 6.25, "y": 3 },
-                { "label": "K37 (B0,D6)", "x": 7.25, "y": 3 },
-                { "label": "K38 (B0,D4)", "x": 8.25, "y": 3 },
-                { "label": "K39 (B0,D5)", "x": 9.25, "y": 3 },
-                { "label": "K3A (B0,D3)", "x": 10.25, "y": 3 },
-                { "label": "K3B (B0,D2)", "x": 11.25, "y": 3 },
-                { "label": "K3C (B0,B6)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (B0,D1)", "x": 14, "y": 3 },
-                { "label": "K3E (B0,D0)", "x": 15, "y": 3 },
-                { "label": "K40 (B1,B2)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (B1,B5)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K42 (B1,F5)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K46 (B1,D7)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K49 (B1,D5)", "x": 10, "y": 4 },
-                { "label": "K4A (B1,D3)", "x": 11, "y": 4 },
-                { "label": "K4B (B1,D2)", "x": 12, "y": 4 },
-                { "label": "K4C (B1,B6)", "x": 13, "y": 4 },
-                { "label": "K4D (B1,D1)", "x": 14, "y": 4 },
-                { "label": "K4E (B1,D0)", "x": 15, "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": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"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.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/vcl65/solder/solder.h b/keyboards/sawnsprojects/vcl65/solder/solder.h
deleted file mode 100644
index 8c150a1b96..0000000000
--- a/keyboards/sawnsprojects/vcl65/solder/solder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, 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, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { 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, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-