Move miscellaneous layouts to data driven (#20516)

2 files changed, 127 insertions, 150 deletions

diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
index d15a543e53..a9436d4d14 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -23,114 +23,133 @@
     "layouts": {
         "LAYOUT_108_fullsize_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "Num Lock", "x": 18.5, "y": 0 },
-                { "label": "MUTE", "x": 19.5, "y": 0 },
-                { "label": "VOLD", "x": 20.5, "y": 0 },
-                { "label": "VOLU", "x": 21.5, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-                { "label": "Num Lock", "x": 18.5, "y": 1.25 },
-                { "label": "/", "x": 19.5, "y": 1.25 },
-                { "label": "*", "x": 20.5, "y": 1.25 },
-                { "label": "-", "x": 21.5, "y": 1.25 },
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-                { "label": "7", "x": 18.5, "y": 2.25 },
-                { "label": "8", "x": 19.5, "y": 2.25 },
-                { "label": "9", "x": 20.5, "y": 2.25 },
-                { "label": "+", "x": 21.5, "y": 2.25, "h": 2 },
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "4", "x": 18.5, "y": 3.25 },
-                { "label": "5", "x": 19.5, "y": 3.25 },
-                { "label": "6", "x": 20.5, "y": 3.25 },
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-                { "label": "1", "x": 18.5, "y": 4.25 },
-                { "label": "2", "x": 19.5, "y": 4.25 },
-                { "label": "3", "x": 20.5, "y": 4.25 },
-                { "label": "Enter", "x": 21.5, "y": 4.25, "h": 2 },
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 },
-                { "label": "0", "x": 18.5, "y": 5.25, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+                {"matrix": [0, 9], "x": 19.5, "y": 0},
+                {"matrix": [1, 9], "x": 20.5, "y": 0},
+                {"matrix": [0, 10], "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, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [2, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 20.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 20.5, "y": 2.25},
+                {"matrix": [6, 0], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 8], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [10, 0], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 9], "x": 17.25, "y": 5.25},
+
+                {"matrix": [11, 9], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/xelus/rs108/rs108.h b/keyboards/xelus/rs108/rs108.h
deleted file mode 100644
index 5ba9d70ce8..0000000000
--- a/keyboards/xelus/rs108/rs108.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 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 XXXXX KC_NO
-
-#define LAYOUT_108_fullsize_ansi( \
-    K0000,        K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106,   K0007, K0107, K0008,   K0108, K0009, K0109, K0010, \
-    K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306,   K0207, K0307, K0208,   K0308, K0209, K0309, K0210, \
-    K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506,   K0407, K0507, K0408,   K0508, K0409, K0509,        \
-    K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705,        K0706,                          K0708, K0609, K0709, K0610, \
-    K0800, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805,               K0906,          K0907,          K0908, K0809, K0909,        \
-    K1000, K1100, K1001,               K1102,                      K1104, K1005,        K1006, K1106,   K1007, K1107, K1008,          K1009, K1109, K1010  \
-) { \
-    { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0010 }, \
-    { XXXXX, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, XXXXX }, \
-    { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, K0210 }, \
-    { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, XXXXX }, \
-    { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, XXXXX }, \
-    { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509, XXXXX }, \
-    { K0600, K0601, K0602, K0603, K0604, K0605, XXXXX, XXXXX, XXXXX, K0609, K0610 }, \
-    { K0700, K0701, K0702, K0703, K0704, K0705, K0706, XXXXX, K0708, K0709, XXXXX }, \
-    { K0800, K0801, K0802, K0803, K0804, K0805, XXXXX, XXXXX, XXXXX, K0809, XXXXX }, \
-    { K0900, K0901, K0902, K0903, K0904, XXXXX, K0906, K0907, K0908, K0909, XXXXX }, \
-    { K1000, K1001, XXXXX, XXXXX, XXXXX, K1005, K1006, K1007, K1008, K1009, K1010 }, \
-    { K1100, XXXXX, K1102, XXXXX, K1104, XXXXX, K1106, K1107, XXXXX, K1109, XXXXX }, \
-}