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

3 files changed, 91 insertions, 123 deletions

diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json
index 5c48352c1f..593c8943a6 100644
--- a/keyboards/handwired/jtallbean/split_65/info.json
+++ b/keyboards/handwired/jtallbean/split_65/info.json
@@ -27,81 +27,96 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"label":"Esc", "x":1.25, "y":0},
-                {"label":"!", "x":2.25, "y":0},
-                {"label":"@", "x":3.25, "y":0},
-                {"label":"#", "x":4.25, "y":0},
-                {"label":"$", "x":5.25, "y":0},
-                {"label":"%", "x":6.25, "y":0},
-                {"label":"^", "x":7.25, "y":0},
-                {"label":"&", "x":9.25, "y":0},
-                {"label":"*", "x":10.25, "y":0},
-                {"label":"(", "x":11.25, "y":0},
-                {"label":")", "x":12.25, "y":0},
-                {"label":"_", "x":13.25, "y":0},
-                {"label":"+", "x":14.25, "y":0},
-                {"label":"~", "x":15.25, "y":0},
-                {"label":"Back", "x":16.25, "y":0},
-                {"label":"Insert", "x":17.25, "y":0},
-                {"label":"PgUp", "x":0, "y":1},
-                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
-                {"label":"Q", "x":2.75, "y":1},
-                {"label":"W", "x":3.75, "y":1},
-                {"label":"E", "x":4.75, "y":1},
-                {"label":"R", "x":5.75, "y":1},
-                {"label":"T", "x":6.75, "y":1},
-                {"label":"Y", "x":8.75, "y":1},
-                {"label":"U", "x":9.75, "y":1},
-                {"label":"I", "x":10.75, "y":1},
-                {"label":"O", "x":11.75, "y":1},
-                {"label":"P", "x":12.75, "y":1},
-                {"label":"{", "x":13.75, "y":1},
-                {"label":"}", "x":14.75, "y":1},
-                {"label":"|", "x":15.75, "y":1, "w":1.5},
-                {"label":"Delete", "x":17.25, "y":1},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":9, "y":2},
-                {"label":"J", "x":10, "y":2},
-                {"label":"K", "x":11, "y":2},
-                {"label":"L", "x":12, "y":2},
-                {"label":":", "x":13, "y":2},
-                {"label":"\"", "x":14, "y":2},
-                {"label":"Enter", "x":15, "y":2, "w":2.25},
-                {"label":"Home", "x":17.25, "y":2},
-                {"label":"Fn", "x":0, "y":3},
-                {"label":"Shift", "x":1.25, "y":3, "w":2.25},
-                {"label":"Z", "x":3.5, "y":3},
-                {"label":"X", "x":4.5, "y":3},
-                {"label":"C", "x":5.5, "y":3},
-                {"label":"V", "x":6.5, "y":3},
-                {"label":"B", "x":7.5, "y":3},
-                {"label":"N", "x":9.5, "y":3},
-                {"label":"M", "x":10.5, "y":3},
-                {"label":"<", "x":11.5, "y":3},
-                {"label":">", "x":12.5, "y":3},
-                {"label":"?", "x":13.5, "y":3},
-                {"label":"Shift", "x":14.5, "y":3, "w":1.75},
-                {"label":"\u2191", "x":16.25, "y":3},
-                {"label":"End", "x":17.25, "y":3},
-                {"label":"Code", "x":0, "y":4},
-                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
-                {"label":"Win", "x":2.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":3.75, "y":4, "w":1.25},
-                {"x":5, "y":4, "w":2.75},
-                {"x":8.75, "y":4, "w":2.25},
-                {"label":"Alt", "x":11, "y":4, "w":1.25},
-                {"label":"Win", "x":12.25, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.5, "y":4, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":4},
-                {"label":"\u2193", "x":16.25, "y":4},
-                {"label":"\u2192", "x":17.25, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.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": [5, 0], "x": 9.25, "y": 0},
+                {"matrix": [5, 1], "x": 10.25, "y": 0},
+                {"matrix": [5, 2], "x": 11.25, "y": 0},
+                {"matrix": [5, 3], "x": 12.25, "y": 0},
+                {"matrix": [5, 4], "x": 13.25, "y": 0},
+                {"matrix": [5, 5], "x": 14.25, "y": 0},
+                {"matrix": [5, 6], "x": 15.25, "y": 0},
+                {"matrix": [5, 7], "x": 16.25, "y": 0},
+                {"matrix": [5, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 2.75, "y": 1},
+                {"matrix": [1, 4], "x": 3.75, "y": 1},
+                {"matrix": [1, 5], "x": 4.75, "y": 1},
+                {"matrix": [1, 6], "x": 5.75, "y": 1},
+                {"matrix": [1, 7], "x": 6.75, "y": 1},
+
+                {"matrix": [6, 0], "x": 8.75, "y": 1},
+                {"matrix": [6, 1], "x": 9.75, "y": 1},
+                {"matrix": [6, 2], "x": 10.75, "y": 1},
+                {"matrix": [6, 3], "x": 11.75, "y": 1},
+                {"matrix": [6, 4], "x": 12.75, "y": 1},
+                {"matrix": [6, 5], "x": 13.75, "y": 1},
+                {"matrix": [6, 6], "x": 14.75, "y": 1},
+                {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [6, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [7, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+                {"matrix": [8, 0], "x": 9.5, "y": 3},
+                {"matrix": [8, 1], "x": 10.5, "y": 3},
+                {"matrix": [8, 2], "x": 11.5, "y": 3},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 4], "x": 13.5, "y": 3},
+                {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16.25, "y": 3},
+                {"matrix": [8, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 5], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/jtallbean/split_65/split_65.c b/keyboards/handwired/jtallbean/split_65/split_65.c
index 09a4086fbc..d408f5577b 100644
--- a/keyboards/handwired/jtallbean/split_65/split_65.c
+++ b/keyboards/handwired/jtallbean/split_65/split_65.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "split_65.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/handwired/jtallbean/split_65/split_65.h b/keyboards/handwired/jtallbean/split_65/split_65.h
deleted file mode 100644
index 8884c5cece..0000000000
--- a/keyboards/handwired/jtallbean/split_65/split_65.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 jtallbean
- *
- * 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 is 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_all( \
-   L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
-   L10, L11,      L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
-   L20, L21,      L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25,      R27, R28, \
-   L30, L31,      L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35,      R37, R38, \
-   L40, L41,      L43, L44, L45,           R40,      R42, R43, R44, R45,      R47, R48  \
- ) \
- { \
-   { L00,   L01,   L02,   L03,   L04,   L05,   L06,   L07,   KC_NO}, \
-   { L10,   L11,   KC_NO, L13,   L14,   L15,   L16,   L17,   KC_NO}, \
-   { L20,   L21,   KC_NO, L23,   L24,   L25,   L26,   L27,   KC_NO}, \
-   { L30,   L31,   KC_NO, L33,   L34,   L35,   L36,   L37,   KC_NO}, \
-   { L40,   L41,   KC_NO, L43,   L44,   L45,   KC_NO, KC_NO, KC_NO}, \
-   { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08  }, \
-   { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18  }, \
-   { R20,   R21,   R22,   R23,   R24,   R25,   KC_NO, R27,   R28  }, \
-   { R30,   R31,   R32,   R33,   R34,   R35,   KC_NO, R37,   R38  }, \
-   { R40,   KC_NO, R42,   R43,   R44,   R45,   KC_NO, R47,   R48  }  \
- }