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

6 files changed, 106 insertions, 164 deletions

diff --git a/keyboards/kakunpc/angel64/alpha/alpha.h b/keyboards/kakunpc/angel64/alpha/alpha.h
deleted file mode 100644
index 6c0898a56a..0000000000
--- a/keyboards/kakunpc/angel64/alpha/alpha.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 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( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
-    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \
-    k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40,   \
-    k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
-    k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64\
-) \
-{ \
-    { k01, k13, k25, k37, k49, k61 }, \
-    { k02, k14, k26, k38, k50, k62 }, \
-    { k03, k15, k27, k39, k51, k63 }, \
-    { k04, k16, k28, k40, k52, k64 }, \
-    { k05, k17, k29, k41, k53, KC_NO }, \
-    { k06, k18, k30, k42, k54, KC_NO }, \
-    { k07, k19, k31, k43, k55, KC_NO }, \
-    { k08, k20, k32, k44, k56, KC_NO }, \
-    { k09, k21, k33, k45, k57, KC_NO }, \
-    { k10, k22, k34, k46, k58, KC_NO }, \
-    { k11, k23, k35, k47, k59, KC_NO }, \
-    { k12, k24, k36, k48, k60, KC_NO } \
-}
diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
index fd2fbb736b..3429799a75 100644
--- a/keyboards/kakunpc/angel64/alpha/info.json
+++ b/keyboards/kakunpc/angel64/alpha/info.json
@@ -15,7 +15,76 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"back", "x":13, "y":0}, {"label":"Q", "x":0, "y":1, "w":1.5}, {"label":"W", "x":1.5, "y":1}, {"label":"E", "x":2.5, "y":1}, {"label":"R", "x":3.5, "y":1}, {"label":"T", "x":4.5, "y":1}, {"label":"Y", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"I", "x":7.5, "y":1}, {"label":"O", "x":8.5, "y":1}, {"label":"P", "x":9.5, "y":1}, {"label":"[", "x":10.5, "y":1}, {"label":"]", "x":11.5, "y":1}, {"label":"|", "x":12.5, "y":1, "w":1.5}, {"label":"Ctrl", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";:", "x":10, "y":2}, {"label":"`", "x":11, "y":2}, {"label":"Enter", "x":12, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":"<", "x":8.5, "y":3}, {"label":">", "x":9.5, "y":3}, {"label":"?", "x":10.5, "y":3}, {"label":"\u2191", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3, "w":1.5}, {"label":"Caps", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Start", "x":2, "y":4, "w":1.5}, {"label":"Ctrl", "x":3.5, "y":4, "w":1.5}, {"label":"Space", "x":5, "y":4, "w":2}, {"label":"Ctrl", "x":7, "y":4, "w":1.5}, {"label":"Alt", "x":8.5, "y":4, "w":1.5}, {"label":"\u2190", "x":10, "y":4}, {"label":"\u2193", "x":11, "y":4}, {"label":"\u2192", "x":12, "y":4}, {"label":"Alt", "x":13, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+                {"matrix": [6, 0], "x": 6, "y": 0},
+                {"matrix": [7, 0], "x": 7, "y": 0},
+                {"matrix": [8, 0], "x": 8, "y": 0},
+                {"matrix": [9, 0], "x": 9, "y": 0},
+                {"matrix": [10, 0], "x": 10, "y": 0},
+                {"matrix": [11, 0], "x": 11, "y": 0},
+                {"matrix": [0, 1], "x": 12, "y": 0},
+                {"matrix": [1, 1], "x": 13, "y": 0},
+
+                {"matrix": [2, 1], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 1},
+                {"matrix": [4, 1], "x": 2.5, "y": 1},
+                {"matrix": [5, 1], "x": 3.5, "y": 1},
+                {"matrix": [6, 1], "x": 4.5, "y": 1},
+                {"matrix": [7, 1], "x": 5.5, "y": 1},
+                {"matrix": [8, 1], "x": 6.5, "y": 1},
+                {"matrix": [9, 1], "x": 7.5, "y": 1},
+                {"matrix": [10, 1], "x": 8.5, "y": 1},
+                {"matrix": [11, 1], "x": 9.5, "y": 1},
+                {"matrix": [0, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 2], "x": 11.5, "y": 1},
+                {"matrix": [2, 2], "x": 12.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 2], "x": 0, "y": 2},
+                {"matrix": [4, 2], "x": 1, "y": 2},
+                {"matrix": [5, 2], "x": 2, "y": 2},
+                {"matrix": [6, 2], "x": 3, "y": 2},
+                {"matrix": [7, 2], "x": 4, "y": 2},
+                {"matrix": [8, 2], "x": 5, "y": 2},
+                {"matrix": [9, 2], "x": 6, "y": 2},
+                {"matrix": [10, 2], "x": 7, "y": 2},
+                {"matrix": [11, 2], "x": 8, "y": 2},
+                {"matrix": [0, 3], "x": 9, "y": 2},
+                {"matrix": [1, 3], "x": 10, "y": 2},
+                {"matrix": [2, 3], "x": 11, "y": 2},
+                {"matrix": [3, 3], "x": 12, "y": 2, "w": 2},
+
+                {"matrix": [4, 3], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 3], "x": 1.5, "y": 3},
+                {"matrix": [6, 3], "x": 2.5, "y": 3},
+                {"matrix": [7, 3], "x": 3.5, "y": 3},
+                {"matrix": [8, 3], "x": 4.5, "y": 3},
+                {"matrix": [9, 3], "x": 5.5, "y": 3},
+                {"matrix": [10, 3], "x": 6.5, "y": 3},
+                {"matrix": [11, 3], "x": 7.5, "y": 3},
+                {"matrix": [0, 4], "x": 8.5, "y": 3},
+                {"matrix": [1, 4], "x": 9.5, "y": 3},
+                {"matrix": [2, 4], "x": 10.5, "y": 3},
+                {"matrix": [3, 4], "x": 11.5, "y": 3},
+                {"matrix": [4, 4], "x": 12.5, "y": 3, "w": 1.5},
+
+                {"matrix": [5, 4], "x": 0, "y": 4},
+                {"matrix": [6, 4], "x": 1, "y": 4},
+                {"matrix": [7, 4], "x": 2, "y": 4, "w": 1.5},
+                {"matrix": [8, 4], "x": 3.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 5, "y": 4, "w": 2},
+                {"matrix": [10, 4], "x": 7, "y": 4, "w": 1.5},
+                {"matrix": [11, 4], "x": 8.5, "y": 4, "w": 1.5},
+                {"matrix": [0, 5], "x": 10, "y": 4},
+                {"matrix": [1, 5], "x": 11, "y": 4},
+                {"matrix": [2, 5], "x": 12, "y": 4},
+                {"matrix": [3, 5], "x": 13, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.h b/keyboards/kakunpc/suihankey/alpha/alpha.h
deleted file mode 100644
index 02bba47104..0000000000
--- a/keyboards/kakunpc/suihankey/alpha/alpha.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, \
-    L10, L11, L12, L13, L14, \
-    L20, L21, L22, L23, L24, \
-              L30, L31, L32  \
-) \
-{ \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32  }, \
-}
diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
index 2f60036d35..b48aab8422 100644
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/alpha/info.json
@@ -21,27 +21,27 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.375},
-                {"x": 1, "y": 0.125},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.125},
-                {"x": 4, "y": 0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
 
-                {"x": 0, "y": 1.375},
-                {"x": 1, "y": 1.125},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.125},
-                {"x": 4, "y": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
 
-                {"x": 0, "y": 2.375},
-                {"x": 1, "y": 2.125},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.125},
-                {"x": 4, "y": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.375},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
 
-                {"x": 3.4, "y": 3.25},
-                {"x": 4.4, "y": 3.55},
-                {"x": 5.4, "y": 3.85}
+                {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+                {"matrix": [3, 2], "x": 5.4, "y": 3.85}
             ]
         }
     }
diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
index b2a6c36716..4f5caa6c63 100644
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/rev1/info.json
@@ -21,27 +21,27 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.375},
-                {"x": 1, "y": 0.125},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.125},
-                {"x": 4, "y": 0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0.375},
+                {"matrix": [1, 0], "x": 1, "y": 0.125},
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0.125},
+                {"matrix": [4, 0], "x": 4, "y": 0.25},
 
-                {"x": 0, "y": 1.375},
-                {"x": 1, "y": 1.125},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.125},
-                {"x": 4, "y": 1.25},
+                {"matrix": [0, 1], "x": 0, "y": 1.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1.125},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
 
-                {"x": 0, "y": 2.375},
-                {"x": 1, "y": 2.125},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.125},
-                {"x": 4, "y": 2.25},
+                {"matrix": [0, 2], "x": 0, "y": 2.375},
+                {"matrix": [1, 2], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [3, 2], "x": 3, "y": 2.125},
+                {"matrix": [4, 2], "x": 4, "y": 2.25},
 
-                {"x": 3.4, "y": 3.25},
-                {"x": 4.4, "y": 3.55},
-                {"x": 5.4, "y": 3.85}
+                {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+                {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+                {"matrix": [2, 3], "x": 5.4, "y": 3.85}
             ]
         }
     }
diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.h b/keyboards/kakunpc/suihankey/rev1/rev1.h
deleted file mode 100644
index cbc877abd5..0000000000
--- a/keyboards/kakunpc/suihankey/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, \
-    L10, L11, L12, L13, L14, \
-    L20, L21, L22, L23, L24, \
-              L30, L31, L32  \
-) \
-{ \
-    { L00, L10, L20, L30 }, \
-    { L01, L11, L21, L31 }, \
-    { L02, L12, L22, L32 }, \
-    { L03, L13, L23, KC_NO }, \
-    { L04, L14, L24, KC_NO }, \
-}