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

2 files changed, 71 insertions, 139 deletions

diff --git a/keyboards/kegen/gboy/gboy.h b/keyboards/kegen/gboy/gboy.h
deleted file mode 100644
index 5a51343e95..0000000000
--- a/keyboards/kegen/gboy/gboy.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2022 Matt Chan
- * 
- * 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 3 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 <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/*
- * This diagram is based off the QK65 layout but without the blocker.
- *
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
- *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │    │0D     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
- *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │1E │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
- *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │   │2C │    │
- * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ ┌─┴───┴────┤
- * │30      │   │30  │3C │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B    │3D │3E │ │3B        │ 2.75u Shift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤ └──────────┘
- *              │40  │41  │42  │46                      │47   │49   │4C │4D │4E │
- *              └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
- *              1.25u, 1.25u, 1.25u, 6.25u, 1.5u, 1.5u
- *
- *              ┌────┬────┬────┬────────────────────────┬───┬───┬───┐
- *              │40  │41  │42  │46                      │47 │48 │49 │
- *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
- *              1.25u, 1.25u, 1.25u, 6.25u, 1u, 1u, 1u
- *
- *              ┌─────┬─────┬───────────────────────────┬───┬───┬───┐
- *              │40   │42   │46                         │47 │48 │49 │
- *              └─────┴─────┴───────────────────────────┴───┴───┴───┘
- *              1.5u, 1.5u, 7u, 1u, 1u, 1u
- *
- *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐
- *              │40   │42   │46                         │47   │49   │
- *              └─────┴─────┴───────────────────────────┴─────┴─────┘
- *              1.5u, 1.5u, 7u, 1.5u, 1.5u
- */
-
-
-
-#define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-	K400, K401, K402,                   K406,             K409, K410, K411, K412, K413, K414  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, K409,  K410,  K411,  K412,  K413,  K414,  KC_NO }  \
-}
diff --git a/keyboards/kegen/gboy/info.json b/keyboards/kegen/gboy/info.json
index d85041de71..84db70f428 100644
--- a/keyboards/kegen/gboy/info.json
+++ b/keyboards/kegen/gboy/info.json
@@ -25,81 +25,81 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label": "GESC",  "x":0,      "y":0},
-                {"label": "1",     "x":1,      "y":0},
-                {"label": "2",     "x":2,      "y":0},
-                {"label": "3",     "x":3,      "y":0},
-                {"label": "4",     "x":4,      "y":0},
-                {"label": "5",     "x":5,      "y":0},
-                {"label": "6",     "x":6,      "y":0},
-                {"label": "7",     "x":7,      "y":0},
-                {"label": "8",     "x":8,      "y":0},
-                {"label": "9",     "x":9,      "y":0},
-                {"label": "0",     "x":10,     "y":0},
-                {"label": "MINS",  "x":11,     "y":0},
-                {"label": "EQL",   "x":12,     "y":0},
-                {"label": "BSPC",  "x":13,     "y":0},
-                {"label": "BSPC",  "x":14,     "y":0},
-                {"label": "HOME",  "x":15,     "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "TAB",   "x":0,      "y":1, "w":1.5},
-                {"label": "Q",     "x":1.5,    "y":1},
-                {"label": "W",     "x":2.5,    "y":1},
-                {"label": "E",     "x":3.5,    "y":1},
-                {"label": "R",     "x":4.5,    "y":1},
-                {"label": "T",     "x":5.5,    "y":1},
-                {"label": "Y",     "x":6.5,    "y":1},
-                {"label": "U",     "x":7.5,    "y":1},
-                {"label": "I",     "x":8.5,    "y":1},
-                {"label": "O",     "x":9.5,    "y":1},
-                {"label": "P",     "x":10.5,   "y":1},
-                {"label": "LBRC",  "x":11.5,   "y":1},
-                {"label": "RBRC",  "x":12.5,   "y":1},
-                {"label": "BSLS",  "x":13.5,   "y":1, "w":1.5},
-                {"label": "PGUP",  "x":15,     "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "CAPS",  "x":0,      "y":2, "w":1.75},
-                {"label": "A",     "x":1.75,   "y":2},
-                {"label": "S",     "x":2.75,   "y":2},
-                {"label": "D",     "x":3.75,   "y":2},
-                {"label": "F",     "x":4.75,   "y":2},
-                {"label": "G",     "x":5.75,   "y":2},
-                {"label": "H",     "x":6.75,   "y":2},
-                {"label": "J",     "x":7.75,   "y":2},
-                {"label": "K",     "x":8.75,   "y":2},
-                {"label": "L",     "x":9.75,   "y":2},
-                {"label": "SCLN",  "x":10.75,  "y":2},
-                {"label": "QUOT",  "x":11.75,  "y":2},
-                {"label": "BSLS",  "x":12.75,  "y":2},
-                {"label": "ENT",   "x":13.75,  "y":2, "w":1.25},
-                {"label": "PGDN",  "x":15,     "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "LSFT",  "x":0,      "y":3, "w":1.25},
-                {"label": "SLSH",  "x":1.25,   "y":3},
-                {"label": "Z",     "x":2.25,   "y":3},
-                {"label": "X",     "x":3.25,   "y":3},
-                {"label": "C",     "x":4.25,   "y":3},
-                {"label": "V",     "x":5.25,   "y":3},
-                {"label": "B",     "x":6.25,   "y":3},
-                {"label": "N",     "x":7.25,   "y":3},
-                {"label": "M",     "x":8.25,   "y":3},
-                {"label": "COMM",  "x":9.25,   "y":3},
-                {"label": "DOT",   "x":10.25,  "y":3},
-                {"label": "SLSH",  "x":11.25,  "y":3},
-                {"label": "RSFT",  "x":12.25,  "y":3, "w":1.75},
-                {"label": "UP",    "x":14,     "y":3},
-                {"label": "END",   "x":15,     "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "LCTL",   "x":0,     "y":4, "w":1.25},
-                {"label": "LGUI",   "x":1.25,  "y":4, "w":1.25},
-                {"label": "LALT",   "x":2.5,   "y":4, "w":1.25},
-                {"label": "SPC",    "x":3.75,  "y":4, "w":6.25},
-                {"label": "RALT",   "x":10,    "y":4},
-                {"label": "MO(1)",  "x":11,    "y":4},
-                {"label": "RCTL",   "x":12,    "y":4},
-                {"label": "LEFT",   "x":13,    "y":4},
-                {"label": "DOWN",   "x":14,    "y":4},
-                {"label": "RGHT",   "x":15,    "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }