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

2 files changed, 18 insertions, 58 deletions

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 }, \
-}