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

2 files changed, 91 insertions, 131 deletions

diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json
index 2eb6697f9c..bca26ecb0a 100644
--- a/keyboards/alf/x11/info.json
+++ b/keyboards/alf/x11/info.json
@@ -31,104 +31,107 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":2, "y":0},
-        {"label":"K02", "x":3, "y":0},
-        {"label":"K03", "x":4, "y":0},
-        {"label":"K04", "x":5, "y":0},
-        {"label":"K05", "x":6.5, "y":0},
-        {"label":"K06", "x":7.5, "y":0},
-        {"label":"K07", "x":8.5, "y":0},
-        {"label":"K08", "x":9.5, "y":0},
-        {"label":"K09", "x":11, "y":0},
-        {"label":"K0A", "x":12, "y":0},
-        {"label":"K0B", "x":13, "y":0},
-        {"label":"K0C", "x":14, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
 
-        {"label":"K62", "x":15.25, "y":0},
-        {"label":"K61", "x":16.25, "y":0},
-        {"label":"K60", "x":17.25, "y":0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
 
-        {"label":"K10", "x":0, "y":1.5},
-        {"label":"K11", "x":1, "y":1.5},
-        {"label":"K12", "x":2, "y":1.5},
-        {"label":"K13", "x":3, "y":1.5},
-        {"label":"K14", "x":4, "y":1.5},
-        {"label":"K15", "x":5, "y":1.5},
-        {"label":"K16", "x":6, "y":1.5},
-        {"label":"K17", "x":7, "y":1.5},
-        {"label":"K18", "x":8, "y":1.5},
-        {"label":"K19", "x":9, "y":1.5},
-        {"label":"K1A", "x":10, "y":1.5},
-        {"label":"K1B", "x":11, "y":1.5},
-        {"label":"K1C", "x":12, "y":1.5},
-        {"label":"K5A", "x":13, "y":1.5, "w":2},
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 8.5, "y": 0},
+        {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-        {"label":"K63", "x":15.25, "y":1.5},
-        {"label":"K65", "x":16.25, "y":1.5},
-        {"label":"K67", "x":17.25, "y":1.5},
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
 
-        {"label":"K20", "x":0, "y":2.5, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2.5},
-        {"label":"K22", "x":2.5, "y":2.5},
-        {"label":"K23", "x":3.5, "y":2.5},
-        {"label":"K24", "x":4.5, "y":2.5},
-        {"label":"K25", "x":5.5, "y":2.5},
-        {"label":"K26", "x":6.5, "y":2.5},
-        {"label":"K27", "x":7.5, "y":2.5},
-        {"label":"K28", "x":8.5, "y":2.5},
-        {"label":"K29", "x":9.5, "y":2.5},
-        {"label":"K2A", "x":10.5, "y":2.5},
-        {"label":"K2B", "x":11.5, "y":2.5},
-        {"label":"K2C", "x":12.5, "y":2.5},
-        {"label":"K4C", "x":13.5, "y":2.5, "w":1.5},
+        {"matrix": [6, 2], "x": 15.25, "y": 0},
+        {"matrix": [6, 1], "x": 16.25, "y": 0},
+        {"matrix": [6, 0], "x": 17.25, "y": 0},
 
-        {"label":"K64", "x":15.25, "y":2.5},
-        {"label":"K66", "x":16.25, "y":2.5},
-        {"label":"K68", "x":17.25, "y":2.5},
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [5, 10], "x": 13, "y": 1.5, "w": 2},
 
-        {"label":"K30", "x":0, "y":3.5, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3.5},
-        {"label":"K32", "x":2.75, "y":3.5},
-        {"label":"K33", "x":3.75, "y":3.5},
-        {"label":"K34", "x":4.75, "y":3.5},
-        {"label":"K35", "x":5.75, "y":3.5},
-        {"label":"K36", "x":6.75, "y":3.5},
-        {"label":"K37", "x":7.75, "y":3.5},
-        {"label":"K38", "x":8.75, "y":3.5},
-        {"label":"K39", "x":9.75, "y":3.5},
-        {"label":"K3A", "x":10.75, "y":3.5},
-        {"label":"K3B", "x":11.75, "y":3.5},
-        {"label":"K3C", "x":12.75, "y":3.5, "w":2.25},
+        {"matrix": [6, 3], "x": 15.25, "y": 1.5},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.5},
+        {"matrix": [6, 7], "x": 17.25, "y": 1.5},
 
-        {"label":"K40", "x":0, "y":4.5, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4.5},
-        {"label":"K42", "x":3.25, "y":4.5},
-        {"label":"K43", "x":4.25, "y":4.5},
-        {"label":"K44", "x":5.25, "y":4.5},
-        {"label":"K45", "x":6.25, "y":4.5},
-        {"label":"K46", "x":7.25, "y":4.5},
-        {"label":"K47", "x":8.25, "y":4.5},
-        {"label":"K48", "x":9.25, "y":4.5},
-        {"label":"K49", "x":10.25, "y":4.5},
-        {"label":"K4A", "x":11.25, "y":4.5},
-        {"label":"K4B", "x":12.25, "y":4.5, "w":1.75},
-        {"label":"K69", "x":14, "y":4.5},
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [4, 12], "x": 13.5, "y": 2.5, "w": 1.5},
 
-        {"label":"K58", "x":16.25, "y":4.5},
+        {"matrix": [6, 4], "x": 15.25, "y": 2.5},
+        {"matrix": [6, 6], "x": 16.25, "y": 2.5},
+        {"matrix": [6, 8], "x": 17.25, "y": 2.5},
 
-        {"label":"K50", "x":0, "y":5.5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"K54", "x":10, "y":5.5, "w":1.25},
-        {"label":"K55", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"K56", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"K57", "x":13.75, "y":5.5, "w":1.25},
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
 
-        {"label":"K6A", "x":15.25, "y":5.5},
-        {"label":"K59", "x":16.25, "y":5.5},
-        {"label":"K6B", "x":17.25, "y":5.5}
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+        {"matrix": [6, 9], "x": 14, "y": 4.5},
+
+        {"matrix": [5, 8], "x": 16.25, "y": 4.5},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [6, 10], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 11], "x": 17.25, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/alf/x11/x11.h b/keyboards/alf/x11/x11.h
deleted file mode 100644
index 2a1d886fdd..0000000000
--- a/keyboards/alf/x11/x11.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 MechMerlin
- *
- * 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"
-
-/* This 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( \
-    K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K62, K61, K60, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K5A,      K63, K65, K67, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4C,      K64, K66, K68, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K69,           K58, \
-    K50, K51, K52,                K53,                K54, K55, K56, K57,      K6A, K59, K6B  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   KC_NO, KC_NO }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO }, \
-}