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

4 files changed, 136 insertions, 46 deletions

diff --git a/keyboards/xelus/kangaroo/info.json b/keyboards/xelus/kangaroo/info.json
index adb6450826..27ec9fc769 100644
--- a/keyboards/xelus/kangaroo/info.json
+++ b/keyboards/xelus/kangaroo/info.json
@@ -8,7 +8,140 @@
     },
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"label":"PrtSc", "x":4.25, "y":0}, {"label":"Scroll Lock", "x":5.25, "y":0}, {"label":"Pause", "x":6.25, "y":0}, {"label":"Esc", "x":7.5, "y":0}, {"label":"F1", "x":9.5, "y":0}, {"label":"F2", "x":10.5, "y":0}, {"label":"F3", "x":11.5, "y":0}, {"label":"F4", "x":12.5, "y":0}, {"label":"F5", "x":14, "y":0}, {"label":"F6", "x":15, "y":0}, {"label":"F7", "x":16, "y":0}, {"label":"F8", "x":17, "y":0}, {"label":"F9", "x":18.5, "y":0}, {"label":"F10", "x":19.5, "y":0}, {"label":"F11", "x":20.5, "y":0}, {"label":"F12", "x":21.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"label":"Insert", "x":4.25, "y":1.25}, {"label":"Home", "x":5.25, "y":1.25}, {"label":"PgUp", "x":6.25, "y":1.25}, {"label":"~", "x":7.5, "y":1.25}, {"label":"!", "x":8.5, "y":1.25}, {"label":"@", "x":9.5, "y":1.25}, {"label":"#", "x":10.5, "y":1.25}, {"label":"$", "x":11.5, "y":1.25}, {"label":"%", "x":12.5, "y":1.25}, {"label":"^", "x":13.5, "y":1.25}, {"label":"&", "x":14.5, "y":1.25}, {"label":"*", "x":15.5, "y":1.25}, {"label":"(", "x":16.5, "y":1.25}, {"label":")", "x":17.5, "y":1.25}, {"label":"_", "x":18.5, "y":1.25}, {"label":"+", "x":19.5, "y":1.25}, {"x":20.5, "y":1.25}, {"x":21.5, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"label":"Delete", "x":4.25, "y":2.25}, {"label":"End", "x":5.25, "y":2.25}, {"label":"PgDn", "x":6.25, "y":2.25}, {"label":"Tab", "x":7.5, "y":2.25, "w":1.5}, {"label":"Q", "x":9, "y":2.25}, {"label":"W", "x":10, "y":2.25}, {"label":"E", "x":11, "y":2.25}, {"label":"R", "x":12, "y":2.25}, {"label":"T", "x":13, "y":2.25}, {"label":"Y", "x":14, "y":2.25}, {"label":"U", "x":15, "y":2.25}, {"label":"I", "x":16, "y":2.25}, {"label":"O", "x":17, "y":2.25}, {"label":"P", "x":18, "y":2.25}, {"label":"{", "x":19, "y":2.25}, {"label":"}", "x":20, "y":2.25}, {"label":"|", "x":21, "y":2.25, "w":1.5}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"label":"Caps Lock", "x":7.5, "y":3.25, "w":1.75}, {"label":"A", "x":9.25, "y":3.25}, {"label":"S", "x":10.25, "y":3.25}, {"label":"D", "x":11.25, "y":3.25}, {"label":"F", "x":12.25, "y":3.25}, {"label":"G", "x":13.25, "y":3.25}, {"label":"H", "x":14.25, "y":3.25}, {"label":"J", "x":15.25, "y":3.25}, {"label":"K", "x":16.25, "y":3.25}, {"label":"L", "x":17.25, "y":3.25}, {"label":":", "x":18.25, "y":3.25}, {"label":"\"", "x":19.25, "y":3.25}, {"label":"Enter", "x":20.25, "y":3.25, "w":2.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"label":"\u2191", "x":5.25, "y":4.25}, {"label":"Shift", "x":7.5, "y":4.25, "w":2.25}, {"label":"Z", "x":9.75, "y":4.25}, {"label":"X", "x":10.75, "y":4.25}, {"label":"C", "x":11.75, "y":4.25}, {"label":"V", "x":12.75, "y":4.25}, {"label":"B", "x":13.75, "y":4.25}, {"label":"N", "x":14.75, "y":4.25}, {"label":"M", "x":15.75, "y":4.25}, {"label":"<", "x":16.75, "y":4.25}, {"label":">", "x":17.75, "y":4.25}, {"label":"?", "x":18.75, "y":4.25}, {"x":19.75, "y":4.25, "w":1.75}, {"x":21.5, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"label":"\u2190", "x":4.25, "y":5.25}, {"label":"\u2193", "x":5.25, "y":5.25}, {"label":"\u2192", "x":6.25, "y":5.25}, {"label":"Ctrl", "x":7.5, "y":5.25, "w":1.25}, {"label":"Win", "x":8.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":6.25}, {"label":"Alt", "x":17.5, "y":5.25, "w":1.25}, {"label":"Win", "x":18.75, "y":5.25, "w":1.25}, {"label":"Menu", "x":20, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":21.25, "y":5.25, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 2], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+
+                {"matrix": [0, 4], "x": 9.5, "y": 0},
+                {"matrix": [1, 4], "x": 10.5, "y": 0},
+                {"matrix": [0, 5], "x": 11.5, "y": 0},
+                {"matrix": [1, 5], "x": 12.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 14, "y": 0},
+                {"matrix": [1, 6], "x": 15, "y": 0},
+                {"matrix": [0, 7], "x": 16, "y": 0},
+                {"matrix": [1, 7], "x": 17, "y": 0},
+
+                {"matrix": [0, 8], "x": 18.5, "y": 0},
+                {"matrix": [1, 8], "x": 19.5, "y": 0},
+                {"matrix": [0, 9], "x": 20.5, "y": 0},
+                {"matrix": [1, 9], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 2], "x": 4.25, "y": 1.25},
+                {"matrix": [3, 2], "x": 5.25, "y": 1.25},
+                {"matrix": [2, 3], "x": 6.25, "y": 1.25},
+
+                {"matrix": [3, 3], "x": 7.5, "y": 1.25},
+                {"matrix": [2, 4], "x": 8.5, "y": 1.25},
+                {"matrix": [3, 4], "x": 9.5, "y": 1.25},
+                {"matrix": [2, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [3, 5], "x": 11.5, "y": 1.25},
+                {"matrix": [2, 6], "x": 12.5, "y": 1.25},
+                {"matrix": [3, 6], "x": 13.5, "y": 1.25},
+                {"matrix": [2, 7], "x": 14.5, "y": 1.25},
+                {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.5, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.5, "y": 1.25},
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25},
+                {"matrix": [5, 0], "x": 1, "y": 2.25},
+                {"matrix": [4, 1], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25},
+
+                {"matrix": [4, 2], "x": 4.25, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.25, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.25, "y": 2.25},
+
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 9, "y": 2.25},
+                {"matrix": [5, 4], "x": 10, "y": 2.25},
+                {"matrix": [4, 5], "x": 11, "y": 2.25},
+                {"matrix": [5, 5], "x": 12, "y": 2.25},
+                {"matrix": [4, 6], "x": 13, "y": 2.25},
+                {"matrix": [5, 6], "x": 14, "y": 2.25},
+                {"matrix": [4, 7], "x": 15, "y": 2.25},
+                {"matrix": [5, 7], "x": 16, "y": 2.25},
+                {"matrix": [4, 8], "x": 17, "y": 2.25},
+                {"matrix": [5, 8], "x": 18, "y": 2.25},
+                {"matrix": [4, 9], "x": 19, "y": 2.25},
+                {"matrix": [5, 9], "x": 20, "y": 2.25},
+                {"matrix": [4, 10], "x": 21, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [7, 0], "x": 1, "y": 3.25},
+                {"matrix": [6, 1], "x": 2, "y": 3.25},
+                {"matrix": [7, 1], "x": 3, "y": 3.25},
+
+                {"matrix": [7, 3], "x": 7.5, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 4], "x": 9.25, "y": 3.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 3.25},
+                {"matrix": [6, 5], "x": 11.25, "y": 3.25},
+                {"matrix": [7, 5], "x": 12.25, "y": 3.25},
+                {"matrix": [6, 6], "x": 13.25, "y": 3.25},
+                {"matrix": [7, 6], "x": 14.25, "y": 3.25},
+                {"matrix": [6, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [7, 7], "x": 16.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 17.25, "y": 3.25},
+                {"matrix": [7, 8], "x": 18.25, "y": 3.25},
+                {"matrix": [6, 9], "x": 19.25, "y": 3.25},
+                {"matrix": [7, 9], "x": 20.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2, "y": 4.25},
+                {"matrix": [9, 1], "x": 3, "y": 4.25},
+
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+
+                {"matrix": [9, 3], "x": 7.5, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 4], "x": 9.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.75, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 12.75, "y": 4.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4.25},
+                {"matrix": [9, 6], "x": 14.75, "y": 4.25},
+                {"matrix": [8, 7], "x": 15.75, "y": 4.25},
+                {"matrix": [9, 7], "x": 16.75, "y": 4.25},
+                {"matrix": [8, 8], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 8], "x": 18.75, "y": 4.25},
+                {"matrix": [8, 9], "x": 19.75, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 9], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25},
+                {"matrix": [11, 0], "x": 1, "y": 5.25},
+                {"matrix": [10, 1], "x": 2, "y": 5.25},
+                {"matrix": [11, 1], "x": 3, "y": 5.25},
+
+                {"matrix": [10, 2], "x": 4.25, "y": 5.25},
+                {"matrix": [11, 2], "x": 5.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 6.25, "y": 5.25},
+
+                {"matrix": [11, 3], "x": 7.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 4], "x": 8.75, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 11.25, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 8], "x": 17.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 8], "x": 18.75, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 9], "x": 20, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 9], "x": 21.25, "y": 5.25, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/xelus/kangaroo/kangaroo.c b/keyboards/xelus/kangaroo/kangaroo.c
index 585d33d498..989b42d4c3 100644
--- a/keyboards/xelus/kangaroo/kangaroo.c
+++ b/keyboards/xelus/kangaroo/kangaroo.c
@@ -14,6 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kangaroo.h"
+#include "quantum.h"
 
 void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/keyboards/xelus/kangaroo/kangaroo.h b/keyboards/xelus/kangaroo/kangaroo.h
deleted file mode 100644
index f8aebc4f90..0000000000
--- a/keyboards/xelus/kangaroo/kangaroo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 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( \
-    K0000, K0100, K0001, K0101,   K0002, K0102, K0003,   K0103,        K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, K0108, K0009, K0109,  \
-    K0200, K0300, K0201, K0301,   K0202, K0302, K0203,   K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0209, K0309, K0210, K0010, \
-    K0400, K0500, K0401, K0501,   K0402, K0502, K0403,   K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, K0409, K0509, K0410, \
-    K0600, K0700, K0601, K0701,                          K0703, K0604, K0704, K0605, K0705, K0606, K0706, K0607, K0707, K0608, K0708, K0609, K0709, \
-    K0800, K0900, K0801, K0901,          K0902,          K0903, K0804, K0904, K0805, K0905, K0806, K0906, K0807, K0907, K0808, K0908, K0809, K0909, \
-    K1000, K1100, K1001, K1101,   K1002, K1102, K1003,   K1103, K1004, K1104,                      K1106,               K1008, K1108, K1009, K1109  \
-) { \
-    { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0010 }, \
-    { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, _____ }, \
-    { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, K0210 }, \
-    { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, _____ }, \
-    { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, K0410 }, \
-    { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509, _____ }, \
-    { K0600, K0601, _____, _____, K0604, K0605, K0606, K0607, K0608, K0609, _____ }, \
-    { K0700, K0701, _____, K0703, K0704, K0705, K0706, K0707, K0708, K0709, _____ }, \
-    { K0800, K0801, _____, _____, K0804, K0805, K0806, K0807, K0808, K0809, _____ }, \
-    { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908, K0909, _____ }, \
-    { K1000, K1001, K1002, K1003, K1004, _____, _____, _____, K1008, K1009, _____ }, \
-    { K1100, K1101, K1102, K1103, K1104, _____, K1106, _____, K1108, K1109, _____ }  \
-}
diff --git a/keyboards/xelus/kangaroo/rev1/rev1.c b/keyboards/xelus/kangaroo/rev1/rev1.c
index 5b79fcad21..c18270ee66 100644
--- a/keyboards/xelus/kangaroo/rev1/rev1.c
+++ b/keyboards/xelus/kangaroo/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kangaroo.h"
+#include "quantum.h"
 
 void board_init(void) {
   SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;