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

3 files changed, 38 insertions, 84 deletions

diff --git a/keyboards/a_dux/a_dux.c b/keyboards/a_dux/a_dux.c
index 16bac16fa9..16c3406f48 100644
--- a/keyboards/a_dux/a_dux.c
+++ b/keyboards/a_dux/a_dux.c
@@ -17,7 +17,7 @@
  * 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 "a_dux.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/a_dux/a_dux.h b/keyboards/a_dux/a_dux.h
deleted file mode 100644
index 83c0a3692b..0000000000
--- a/keyboards/a_dux/a_dux.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@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/>.
- */
-
-#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_2( \
-        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, R16, R17                 \
-    ) \
-    { \
-        { L01, L02, L03, L04, L05 }, \
-        { L06, L07, L08, L09, L10 }, \
-        { L11, L12, L13, L14, L15 }, \
-        { L16, L17, ___, ___, ___ }, \
-        { R01, R02, R03, R04, R05 }, \
-        { R06, R07, R08, R09, R10 }, \
-        { R11, R12, R13, R14, R15 }, \
-        { R16, R17, ___, ___, ___ }  \
-    }
-
-#define LAYOUT LAYOUT_split_3x5_2
-
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
index c0aef4bebf..29259a180c 100644
--- a/keyboards/a_dux/info.json
+++ b/keyboards/a_dux/info.json
@@ -35,50 +35,53 @@
         }
     },
     "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 1.33},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"x": 0, "y": 1.33, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
 
-                {"x": 8, "y": 0.42},
-                {"x": 9, "y": 0.28},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0.31},
-                {"x": 12, "y": 1.33},
+                {"x": 8, "y": 0.42, "matrix": [4, 0]},
+                {"x": 9, "y": 0.28, "matrix": [4, 1]},
+                {"x": 10, "y": 0, "matrix": [4, 2]},
+                {"x": 11, "y": 0.31, "matrix": [4, 3]},
+                {"x": 12, "y": 1.33, "matrix": [4, 4]},
 
-                {"x": 0, "y": 2.33},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"x": 0, "y": 2.33, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
 
-                {"x": 8, "y": 1.42},
-                {"x": 9, "y": 1.28},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1.31},
-                {"x": 12, "y": 2.33},
+                {"x": 8, "y": 1.42, "matrix": [5, 0]},
+                {"x": 9, "y": 1.28, "matrix": [5, 1]},
+                {"x": 10, "y": 1, "matrix": [5, 2]},
+                {"x": 11, "y": 1.31, "matrix": [5, 3]},
+                {"x": 12, "y": 2.33, "matrix": [5, 4]},
 
-                {"x": 0, "y": 3.33},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"x": 0, "y": 3.33, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
 
-                {"x": 8, "y": 2.42},
-                {"x": 9, "y": 2.28},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2.31},
-                {"x": 12, "y": 3.33},
+                {"x": 8, "y": 2.42, "matrix": [6, 0]},
+                {"x": 9, "y": 2.28, "matrix": [6, 1]},
+                {"x": 10, "y": 2, "matrix": [6, 2]},
+                {"x": 11, "y": 2.31, "matrix": [6, 3]},
+                {"x": 12, "y": 3.33, "matrix": [6, 4]},
 
-                {"x": 4, "y": 3.75},
-                {"x": 5, "y": 4},
+                {"x": 4, "y": 3.75, "matrix": [3, 0]},
+                {"x": 5, "y": 4, "matrix": [3, 1]},
 
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 3.75}
+                {"x": 7, "y": 4, "matrix": [7, 0]},
+                {"x": 8, "y": 3.75, "matrix": [7, 1]}
             ]
         }
     }