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

2 files changed, 68 insertions, 106 deletions

diff --git a/keyboards/alf/x2/info.json b/keyboards/alf/x2/info.json
index 7619f6ed66..974484db19 100644
--- a/keyboards/alf/x2/info.json
+++ b/keyboards/alf/x2/info.json
@@ -28,79 +28,79 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":1.5, "y":0},
-                {"x":2.5, "y":0},
+                {"matrix": [4, 4], "x": 1.5, "y": 0},
+                {"matrix": [4, 8], "x": 2.5, "y": 0},
 
-                {"label":"~", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"@", "x":2, "y":1},
-                {"label":"#", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [0, 3], "x": 3, "y": 1},
+                {"matrix": [0, 4], "x": 4, "y": 1},
+                {"matrix": [0, 5], "x": 5, "y": 1},
+                {"matrix": [0, 6], "x": 6, "y": 1},
+                {"matrix": [0, 7], "x": 7, "y": 1},
+                {"matrix": [0, 8], "x": 8, "y": 1},
+                {"matrix": [0, 9], "x": 9, "y": 1},
+                {"matrix": [0, 10], "x": 10, "y": 1},
+                {"matrix": [0, 11], "x": 11, "y": 1},
+                {"matrix": [0, 12], "x": 12, "y": 1},
+                {"matrix": [0, 13], "x": 13, "y": 1},
+                {"matrix": [0, 14], "x": 14, "y": 1},
 
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2},
+                {"matrix": [1, 3], "x": 2.5, "y": 2},
+                {"matrix": [1, 4], "x": 3.5, "y": 2},
+                {"matrix": [1, 5], "x": 4.5, "y": 2},
+                {"matrix": [1, 6], "x": 5.5, "y": 2},
+                {"matrix": [1, 7], "x": 6.5, "y": 2},
+                {"matrix": [1, 8], "x": 7.5, "y": 2},
+                {"matrix": [1, 9], "x": 8.5, "y": 2},
+                {"matrix": [1, 10], "x": 9.5, "y": 2},
+                {"matrix": [1, 11], "x": 10.5, "y": 2},
+                {"matrix": [1, 12], "x": 11.5, "y": 2},
+                {"matrix": [1, 13], "x": 12.5, "y": 2},
+                {"matrix": [1, 14], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 3},
+                {"matrix": [2, 3], "x": 2.75, "y": 3},
+                {"matrix": [2, 4], "x": 3.75, "y": 3},
+                {"matrix": [2, 5], "x": 4.75, "y": 3},
+                {"matrix": [2, 6], "x": 5.75, "y": 3},
+                {"matrix": [2, 7], "x": 6.75, "y": 3},
+                {"matrix": [2, 8], "x": 7.75, "y": 3},
+                {"matrix": [2, 9], "x": 8.75, "y": 3},
+                {"matrix": [2, 10], "x": 9.75, "y": 3},
+                {"matrix": [2, 11], "x": 10.75, "y": 3},
+                {"matrix": [2, 12], "x": 11.75, "y": 3},
+                {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
 
-                {"label":"Shift", "x":0, "y":4},
-                {"x":1, "y":4},
-                {"label":"Z", "x":2, "y":4},
-                {"label":"X", "x":3, "y":4},
-                {"label":"C", "x":4, "y":4},
-                {"label":"V", "x":5, "y":4},
-                {"label":"B", "x":6, "y":4},
-                {"label":"N", "x":7, "y":4},
-                {"label":"M", "x":8, "y":4},
-                {"label":"<", "x":9, "y":4},
-                {"label":">", "x":10, "y":4},
-                {"label":"?", "x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4},
+                {"matrix": [3, 4], "x": 4, "y": 4},
+                {"matrix": [3, 5], "x": 5, "y": 4},
+                {"matrix": [3, 6], "x": 6, "y": 4},
+                {"matrix": [3, 7], "x": 7, "y": 4},
+                {"matrix": [3, 8], "x": 8, "y": 4},
+                {"matrix": [3, 9], "x": 9, "y": 4},
+                {"matrix": [3, 10], "x": 10, "y": 4},
+                {"matrix": [3, 11], "x": 11, "y": 4},
+                {"matrix": [3, 12], "x": 12, "y": 4},
+                {"matrix": [3, 13], "x": 13, "y": 4},
+                {"matrix": [3, 14], "x": 14, "y": 4},
 
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Win", "x":11, "y":5},
-                {"label":"Menu", "x":12, "y":5},
-                {"label":"Ctrl", "x":13, "y":5},
-                {"x":14, "y":5}
+                {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 5},
+                {"matrix": [4, 11], "x": 11, "y": 5},
+                {"matrix": [4, 12], "x": 12, "y": 5},
+                {"matrix": [4, 13], "x": 13, "y": 5},
+                {"matrix": [4, 14], "x": 14, "y": 5}
             ]
         }
     }
diff --git a/keyboards/alf/x2/x2.h b/keyboards/alf/x2/x2.h
deleted file mode 100644
index 48683ea50b..0000000000
--- a/keyboards/alf/x2/x2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018-2021 @fixed, MechMerlin, QMK
- *
- * 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 ___ KC_NO
-
-// K44 and K48 are the microswitches at the top of the PCB
-
-#define LAYOUT_all( \
-            K44, K48,                                                          \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___ }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E }  \
-}