2 files changed, 53 insertions, 48 deletions
diff --git a/keyboards/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
index 3d13b5b2f2..071d876c1a 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -3,5 +3,57 @@
         "cols": ["F4", "F5", "F6", "F7"],
         "rows": ["D4", "C6", "D7", "E6", "B4"]
     },
-    "diode_direction": "COL2ROW"
+    "diode_direction": "COL2ROW",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"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},
+
+                {"matrix": [9, 0], "x": 8.2, "y": 0.25},
+                {"matrix": [8, 0], "x": 9.2, "y": 0.125},
+                {"matrix": [7, 0], "x": 10.2, "y": 0},
+                {"matrix": [6, 0], "x": 11.2, "y": 0.125},
+                {"matrix": [5, 0], "x": 12.2, "y": 0.375},
+
+                {"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},
+
+                {"matrix": [9, 1], "x": 8.2, "y": 1.25},
+                {"matrix": [8, 1], "x": 9.2, "y": 1.125},
+                {"matrix": [7, 1], "x": 10.2, "y": 1},
+                {"matrix": [6, 1], "x": 11.2, "y": 1.125},
+                {"matrix": [5, 1], "x": 12.2, "y": 1.375},
+
+                {"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},
+
+                {"matrix": [9, 2], "x": 8.2, "y": 2.25},
+                {"matrix": [8, 2], "x": 9.2, "y": 2.125},
+                {"matrix": [7, 2], "x": 10.2, "y": 2},
+                {"matrix": [6, 2], "x": 11.2, "y": 2.125},
+                {"matrix": [5, 2], "x": 12.2, "y": 2.375},
+
+                {"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},
+
+                {"matrix": [7, 3], "x": 6.8, "y": 3.85},
+                {"matrix": [6, 3], "x": 7.8, "y": 3.55},
+                {"matrix": [5, 3], "x": 8.8, "y": 3.25}
+            ]
+        }
+    }
 }
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h
deleted file mode 100644
index 98618ba712..0000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h
+++ /dev/null
@@ -1,47 +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_split_3x5_3( \
-    L00, L01, L02, L03, L04,            R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14,            R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24,            R24, R23, R22, R21, R20, \
-              L30, L31, L32,            R32, R31, R30   \
-) \
-{ \
-    { L00, L10, L20, L30 }, \
-    { L01, L11, L21, L31 }, \
-    { L02, L12, L22, L32 }, \
-    { L03, L13, L23, KC_NO }, \
-    { L04, L14, L24, KC_NO }, \
-    { R00, R10, R20, R30 }, \
-    { R01, R11, R21, R31 }, \
-    { R02, R12, R22, R32 }, \
-    { R03, R13, R23, KC_NO }, \
-    { R04, R14, R24, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3