Move layouts for direct_pins boards to data driven (#19872)

3 files changed, 48 insertions, 66 deletions

diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json
index e8e1872f88..292f69085a 100644
--- a/keyboards/miniaxe/info.json
+++ b/keyboards/miniaxe/info.json
@@ -22,9 +22,56 @@
         ]
     },
     "community_layouts": ["split_3x5_3"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_3"
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Cmd", "x":2, "y":3}, {"label":"⇓", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"Opt", "x":8, "y":3}]
+            "layout": [
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+
+                {"x":6, "y":0, "matrix": [4, 0]},
+                {"x":7, "y":0, "matrix": [4, 1]},
+                {"x":8, "y":0, "matrix": [4, 2]},
+                {"x":9, "y":0, "matrix": [4, 3]},
+                {"x":10, "y":0, "matrix": [4, 4]},
+
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+
+                {"x":6, "y":1, "matrix": [5, 0]},
+                {"x":7, "y":1, "matrix": [5, 1]},
+                {"x":8, "y":1, "matrix": [5, 2]},
+                {"x":9, "y":1, "matrix": [5, 3]},
+                {"x":10, "y":1, "matrix": [5, 4]},
+
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+
+                {"x":6, "y":2, "matrix": [6, 0]},
+                {"x":7, "y":2, "matrix": [6, 1]},
+                {"x":8, "y":2, "matrix": [6, 2]},
+                {"x":9, "y":2, "matrix": [6, 3]},
+                {"x":10, "y":2, "matrix": [6, 4]},
+
+                {"x":2, "y":3, "matrix": [3, 0]},
+                {"x":3, "y":3, "matrix": [3, 1]},
+                {"x":4, "y":3, "matrix": [3, 2]},
+
+                {"x":6, "y":3, "matrix": [7, 0]},
+                {"x":7, "y":3, "matrix": [7, 1]},
+                {"x":8, "y":3, "matrix": [7, 2]}
+            ]
         }
     }
 }
diff --git a/keyboards/miniaxe/miniaxe.c b/keyboards/miniaxe/miniaxe.c
deleted file mode 100644
index bda61784ed..0000000000
--- a/keyboards/miniaxe/miniaxe.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
- *
- * 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/>.
- */
-#include "miniaxe.h"
diff --git a/keyboards/miniaxe/miniaxe.h b/keyboards/miniaxe/miniaxe.h
deleted file mode 100644
index fc23865c36..0000000000
--- a/keyboards/miniaxe/miniaxe.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
- *
- * 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.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_3( \
-    L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
-    L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
-    L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
-              L16, L17, L18, R16, R17, R18 \
-) { \
-    { L01, L02, L03, L04, L05 }, \
-    { L06, L07, L08, L09, L10 }, \
-    { L11, L12, L13, L14, L15 }, \
-    { L16, L17, L18, ___, ___ }, \
-    { R01, R02, R03, R04, R05 }, \
-    { R06, R07, R08, R09, R10 }, \
-    { R11, R12, R13, R14, R15 }, \
-    { R16, R17, R18, ___, ___ } \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3