Move single `LAYOUT`s to data driven (#20365)

5 files changed, 174 insertions, 158 deletions

diff --git a/keyboards/handwired/split65/info.json b/keyboards/handwired/split65/info.json
index c766f894e1..14b83bd47a 100644
--- a/keyboards/handwired/split65/info.json
+++ b/keyboards/handwired/split65/info.json
@@ -7,85 +7,5 @@
         "vid": "0x4A57",
         "pid": "0x0000",
         "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"`\u00ac", "x":0, "y":0},
-                {"label":"1!", "x":1, "y":0},
-                {"label":"2\"", "x":2, "y":0},
-                {"label":"3\u00a3", "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":8, "y":0},
-                {"label":"8*", "x":9, "y":0},
-                {"label":"9(", "x":10, "y":0},
-                {"label":"0)", "x":11, "y":0},
-                {"label":"-_", "x":12, "y":0},
-                {"label":"=+", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0, "w":2},
-                {"label":"Insert", "x":16, "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":7.5, "y":1},
-                {"label":"U", "x":8.5, "y":1},
-                {"label":"I", "x":9.5, "y":1},
-                {"label":"O", "x":10.5, "y":1},
-                {"label":"P", "x":11.5, "y":1},
-                {"label":"[{", "x":12.5, "y":1},
-                {"label":"]}", "x":13.5, "y":1},
-                {"label":"Delete", "x":16, "y":1},
-
-                {"label":"Caps Lock", "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":7.75, "y":2},
-                {"label":"J", "x":8.75, "y":2},
-                {"label":"K", "x":9.75, "y":2},
-                {"label":"L", "x":10.75, "y":2},
-                {"label":";:", "x":11.75, "y":2},
-                {"label":"'@", "x":12.75, "y":2},
-                {"label":"#~", "x":13.75, "y":2},
-                {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
-                {"label":"Page Up", "x":16, "y":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"\\|", "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":8.25, "y":3},
-                {"label":"M", "x":9.25, "y":3},
-                {"label":",<", "x":10.25, "y":3},
-                {"label":".>", "x":11.25, "y":3},
-                {"label":"/?", "x":12.25, "y":3},
-                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
-                {"label":"Up", "x":15, "y":3},
-                {"label":"Page Down", "x":16, "y":3},
-
-                {"label":"Ctrl", "x":0.25, "y":4, "w":1.25},
-                {"label":"Win", "x":1.5, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.75, "y":4, "w":1.25},
-                {"label":"Space", "x":4, "y":4, "w":2.75},
-                {"label":"Enter", "x":8, "y":4, "w":2.25},
-                {"label":"AltGr", "x":10.25, "y":4},
-                {"label":"Lower", "x":11.25, "y":4},
-                {"label":"Raise", "x":12.25, "y":4},
-                {"label":"Left", "x":14, "y":4},
-                {"label":"Down", "x":15, "y":4},
-                {"label":"Right", "x":16, "y":4}
-            ]
-        }
     }
 }
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
index 56d2dcb9ab..e1540d99a2 100644
--- a/keyboards/handwired/split65/promicro/info.json
+++ b/keyboards/handwired/split65/promicro/info.json
@@ -8,5 +8,91 @@
         "soft_serial_pin": "D3"
     },
     "processor": "atmega32u4",
-    "bootloader": "caterina"
+    "bootloader": "caterina",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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": [5, 7], "x": 8, "y": 0},
+                {"matrix": [5, 6], "x": 9, "y": 0},
+                {"matrix": [5, 5], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+
+                {"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": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [6, 6], "x": 8.5, "y": 1},
+                {"matrix": [6, 5], "x": 9.5, "y": 1},
+                {"matrix": [6, 4], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 12.5, "y": 1},
+                {"matrix": [6, 1], "x": 13.5, "y": 1},
+                {"matrix": [6, 0], "x": 16, "y": 1},
+
+                {"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": [9, 7], "x": 7.75, "y": 2},
+                {"matrix": [7, 7], "x": 8.75, "y": 2},
+                {"matrix": [7, 6], "x": 9.75, "y": 2},
+                {"matrix": [7, 5], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 2], "x": 13.75, "y": 2},
+                {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 0], "x": 16, "y": 2},
+
+                {"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": [8, 7], "x": 8.25, "y": 3},
+                {"matrix": [8, 6], "x": 9.25, "y": 3},
+                {"matrix": [8, 5], "x": 10.25, "y": 3},
+                {"matrix": [8, 4], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 4], "x": 11.25, "y": 4},
+                {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+                {"matrix": [9, 2], "x": 14, "y": 4},
+                {"matrix": [9, 1], "x": 15, "y": 4},
+                {"matrix": [9, 0], "x": 16, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h
deleted file mode 100644
index 8c4e656cf2..0000000000
--- a/keyboards/handwired/split65/promicro/promicro.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com>
- *
- * 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 LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,      R17, R16, R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,      R47, R27, R26, R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42,      L43,                R46, R45, R44, R43, R42, R41, R40 \
-    ) \
-    { \
-        {L00, L01, L02, L03,   L04, L05,   L06,   KC_NO}, \
-        {L10, L11, L12, L13,   L14, L15,   KC_NO, KC_NO}, \
-        {L20, L21, L22, L23,   L24, L25,   KC_NO, KC_NO}, \
-        {L30, L31, L32, L33,   L34, L35,   L36,   KC_NO}, \
-        {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \
-        {R00, R01, R02, R03, R04, R05, R06, R07}, \
-        {R10, R11, R12, R13, R14, R15, R16, R17}, \
-        {R20, R21, R22, R23, R24, R25, R26, R27}, \
-        {R30, R31, R32, R33, R34, R35, R36, R37}, \
-        {R40, R41, R42, R43, R44, R45, R46, R47} \
-    }
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
index e2c0a634f3..b9956ed7ab 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/info.json
@@ -9,5 +9,91 @@
     },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
-    "board": "QMK_PROTON_C"
+    "board": "QMK_PROTON_C",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"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": [5, 7], "x": 8, "y": 0},
+                {"matrix": [5, 6], "x": 9, "y": 0},
+                {"matrix": [5, 5], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+
+                {"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": [6, 7], "x": 7.5, "y": 1},
+                {"matrix": [6, 6], "x": 8.5, "y": 1},
+                {"matrix": [6, 5], "x": 9.5, "y": 1},
+                {"matrix": [6, 4], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 2], "x": 12.5, "y": 1},
+                {"matrix": [6, 1], "x": 13.5, "y": 1},
+                {"matrix": [6, 0], "x": 16, "y": 1},
+
+                {"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": [9, 7], "x": 7.75, "y": 2},
+                {"matrix": [7, 7], "x": 8.75, "y": 2},
+                {"matrix": [7, 6], "x": 9.75, "y": 2},
+                {"matrix": [7, 5], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 3], "x": 12.75, "y": 2},
+                {"matrix": [7, 2], "x": 13.75, "y": 2},
+                {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [7, 0], "x": 16, "y": 2},
+
+                {"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": [8, 7], "x": 8.25, "y": 3},
+                {"matrix": [8, 6], "x": 9.25, "y": 3},
+                {"matrix": [8, 5], "x": 10.25, "y": 3},
+                {"matrix": [8, 4], "x": 11.25, "y": 3},
+                {"matrix": [8, 3], "x": 12.25, "y": 3},
+                {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [9, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 4], "x": 11.25, "y": 4},
+                {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+                {"matrix": [9, 2], "x": 14, "y": 4},
+                {"matrix": [9, 1], "x": 15, "y": 4},
+                {"matrix": [9, 0], "x": 16, "y": 4}
+            ]
+        }
+    }
 }
diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h
deleted file mode 100644
index be3dd1639b..0000000000
--- a/keyboards/handwired/split65/stm32/stm32.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com>
- *
- * 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 LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15,      R17, R16, R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25,      R47, R27, R26, R25, R24, R23, R22, R21, R20, \
-    L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42,      L43,                R46, R45, R44, R43, R42, R41, R40 \
-    ) \
-    { \
-        {L00, L01, L02, L03,   L04, L05,   L06,   KC_NO}, \
-        {L10, L11, L12, L13,   L14, L15,   KC_NO, KC_NO}, \
-        {L20, L21, L22, L23,   L24, L25,   KC_NO, KC_NO}, \
-        {L30, L31, L32, L33,   L34, L35,   L36,   KC_NO}, \
-        {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \
-        {R00, R01, R02, R03, R04, R05, R06, R07}, \
-        {R10, R11, R12, R13, R14, R15, R16, R17}, \
-        {R20, R21, R22, R23, R24, R25, R26, R27}, \
-        {R30, R31, R32, R33, R34, R35, R36, R37}, \
-        {R40, R41, R42, R43, R44, R45, R46, R47} \
-    }