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

3 files changed, 120 insertions, 143 deletions

diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
index 2fe1624712..241c35d9af 100644
--- a/keyboards/xelus/trinityxttkl/info.json
+++ b/keyboards/xelus/trinityxttkl/info.json
@@ -22,111 +22,125 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.75, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.5, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2.25, "y":1.25},
-                {"x":3.25, "y":1.25},
-                {"x":4.25, "y":1.25},
-                {"x":5.25, "y":1.25},
-                {"x":6.25, "y":1.25},
-                {"x":7.25, "y":1.25},
-                {"x":8.25, "y":1.25},
-                {"x":9.25, "y":1.25},
-                {"x":10.25, "y":1.25},
-                {"x":11.25, "y":1.25},
-                {"x":12.25, "y":1.25},
-                {"x":13.25, "y":1.25},
-                {"x":14.25, "y":1.25},
-                {"x":15.25, "y":1.25},
-                {"x":16.25, "y":1.25},
-                {"x":17.5, "y":1.25},
-                {"x":18.5, "y":1.25},
-                {"x":19.5, "y":1.25},
-
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2.25, "y":2.25, "w":1.5},
-                {"x":3.75, "y":2.25},
-                {"x":4.75, "y":2.25},
-                {"x":5.75, "y":2.25},
-                {"x":6.75, "y":2.25},
-                {"x":7.75, "y":2.25},
-                {"x":8.75, "y":2.25},
-                {"x":9.75, "y":2.25},
-                {"x":10.75, "y":2.25},
-                {"x":11.75, "y":2.25},
-                {"x":12.75, "y":2.25},
-                {"x":13.75, "y":2.25},
-                {"x":14.75, "y":2.25},
-                {"x":15.75, "y":2.25, "w":1.5},
-                {"x":17.5, "y":2.25},
-                {"x":18.5, "y":2.25},
-                {"x":19.5, "y":2.25},
-
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2.25, "y":3.25, "w":1.75},
-                {"x":4, "y":3.25},
-                {"x":5, "y":3.25},
-                {"x":6, "y":3.25},
-                {"x":7, "y":3.25},
-                {"x":8, "y":3.25},
-                {"x":9, "y":3.25},
-                {"x":10, "y":3.25},
-                {"x":11, "y":3.25},
-                {"x":12, "y":3.25},
-                {"x":13, "y":3.25},
-                {"x":14, "y":3.25},
-                {"x":15, "y":3.25, "w":2.25},
-
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2.25, "y":4.25, "w":2.25},
-                {"x":4.5, "y":4.25},
-                {"x":5.5, "y":4.25},
-                {"x":6.5, "y":4.25},
-                {"x":7.5, "y":4.25},
-                {"x":8.5, "y":4.25},
-                {"x":9.5, "y":4.25},
-                {"x":10.5, "y":4.25},
-                {"x":11.5, "y":4.25},
-                {"x":12.5, "y":4.25},
-                {"x":13.5, "y":4.25},
-                {"x":14.5, "y":4.25, "w":1.75},
-                {"x":16.25, "y":4.25},
-                {"x":18.5, "y":4.25},
-
-                {"x":0, "y":5.25},
-                {"x":1, "y":5.25},
-                {"x":2.25, "y":5.25, "w":1.5},
-                {"x":4.75, "y":5.25, "w":1.5},
-                {"x":6.25, "y":5.25, "w":3},
-                {"x":9.25, "y":5.25},
-                {"x":10.25, "y":5.25, "w":3},
-                {"x":13.25, "y":5.25, "w":1.5},
-                {"x":15.75, "y":5.25, "w":1.5},
-                {"x":17.5, "y":5.25},
-                {"x":18.5, "y":5.25},
-                {"x":19.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.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},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 16], "x": 17.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [3, 7], "x": 8, "y": 3.25},
+                {"matrix": [3, 8], "x": 9, "y": 3.25},
+                {"matrix": [3, 9], "x": 10, "y": 3.25},
+                {"matrix": [3, 10], "x": 11, "y": 3.25},
+                {"matrix": [3, 11], "x": 12, "y": 3.25},
+                {"matrix": [3, 12], "x": 13, "y": 3.25},
+                {"matrix": [3, 13], "x": 14, "y": 3.25},
+                {"matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+                {"matrix": [5, 5], "x": 9.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/xelus/trinityxttkl/trinityxttkl.c b/keyboards/xelus/trinityxttkl/trinityxttkl.c
index 79d3df949d..f3d914b5ee 100644
--- a/keyboards/xelus/trinityxttkl/trinityxttkl.c
+++ b/keyboards/xelus/trinityxttkl/trinityxttkl.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "trinityxttkl.h"
+#include "quantum.h"
 
 // Tested and verified working on Trinity XT TKL
 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/xelus/trinityxttkl/trinityxttkl.h b/keyboards/xelus/trinityxttkl/trinityxttkl.h
deleted file mode 100644
index df0540bab6..0000000000
--- a/keyboards/xelus/trinityxttkl/trinityxttkl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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
-
-#define LAYOUT_all( \
-    K000, K001,   K002,       K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015,             K016, K017, K018, \
-    K100, K101,   K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K315,       K116, K117, K118, \
-    K200, K201,   K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215,             K216, K217, K218, \
-    K300, K301,   K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,                                     \
-    K400, K401,   K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415,                         K417,       \
-    K500, K501,   K502,       K503,       K504, K505, K511,             K512,             K515,                   K516, K517, K518  \
-) { \
-    { K000, K001, K002, ____, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____, ____, ____ }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, K415, ____, K417, ____ }, \
-    { K500, K501, K502, K503, K504, K505, ____, ____, ____, ____, ____, K511, K512, ____, ____, K515, K516, K517, K518 }  \
-}