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

3 files changed, 34 insertions, 90 deletions

diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json
index 87f4225c5e..e82a6dd304 100644
--- a/keyboards/z34/info.json
+++ b/keyboards/z34/info.json
@@ -34,47 +34,47 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.93},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"x": 0, "y": 0.93, "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": 7, "y": 0.42},
-                {"x": 8, "y": 0.28},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0.31},
-                {"x": 11, "y": 0.93},
+                {"x": 7, "y": 0.42, "matrix": [4, 0]},
+                {"x": 8, "y": 0.28, "matrix": [4, 1]},
+                {"x": 9, "y": 0, "matrix": [4, 2]},
+                {"x": 10, "y": 0.31, "matrix": [4, 3]},
+                {"x": 11, "y": 0.93, "matrix": [4, 4]},
 
-                {"x": 0, "y": 1.93},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"x": 0, "y": 1.93, "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": 7, "y": 1.42},
-                {"x": 8, "y": 1.28},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1.31},
-                {"x": 11, "y": 1.93},
+                {"x": 7, "y": 1.42, "matrix": [5, 0]},
+                {"x": 8, "y": 1.28, "matrix": [5, 1]},
+                {"x": 9, "y": 1, "matrix": [5, 2]},
+                {"x": 10, "y": 1.31, "matrix": [5, 3]},
+                {"x": 11, "y": 1.93, "matrix": [5, 4]},
 
-                {"x": 0, "y": 2.93},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"x": 0, "y": 2.93, "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": 7, "y": 2.42},
-                {"x": 8, "y": 2.28},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2.31},
-                {"x": 11, "y": 2.93},
+                {"x": 7, "y": 2.42, "matrix": [6, 0]},
+                {"x": 8, "y": 2.28, "matrix": [6, 1]},
+                {"x": 9, "y": 2, "matrix": [6, 2]},
+                {"x": 10, "y": 2.31, "matrix": [6, 3]},
+                {"x": 11, "y": 2.93, "matrix": [6, 4]},
 
-                {"x": 3.5, "y": 3.5},
-                {"x": 4.5, "y": 4},
+                {"x": 3.5, "y": 3.5, "matrix": [3, 0]},
+                {"x": 4.5, "y": 4, "matrix": [3, 1]},
 
-                {"x": 6.5, "y": 4},
-                {"x": 7.5, "y": 3.5}
+                {"x": 6.5, "y": 4, "matrix": [7, 0]},
+                {"x": 7.5, "y": 3.5, "matrix": [7, 1]}
             ]
         }
     }
diff --git a/keyboards/z34/z34.c b/keyboards/z34/z34.c
deleted file mode 100644
index 779562e630..0000000000
--- a/keyboards/z34/z34.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Sergi Meseguer <zigotica@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 "z34.h"
diff --git a/keyboards/z34/z34.h b/keyboards/z34/z34.h
deleted file mode 100644
index 3def2d4c2c..0000000000
--- a/keyboards/z34/z34.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 Sergi Meseguer <zigotica@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 */
-
-#define ___ KC_NO
-
-#define LAYOUT( \
-        L05, L04, L03, L02, L01, R01, R02, R03, R04, R05, \
-        L10, L09, L08, L07, L06, R06, R07, R08, R09, R10, \
-        L15, L14, L13, L12, L11, R11, R12, R13, R14, R15, \
-                       L17, L16, R16, R17                 \
-    ) \
-    { \
-        { L05, L04, L03, L02, L01 }, \
-        { L10, L09, L08, L07, L06 }, \
-        { L15, L14, L13, L12, L11 }, \
-        { L17, L16, ___, ___ , ___}, \
-        { R01, R02, R03, R04, R05 }, \
-        { R06, R07, R08, R09, R10 }, \
-        { R11, R12, R13, R14, R15 }, \
-        { R16, R17, ___, ___, ___ }  \
-    }
-