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

3 files changed, 13 insertions, 47 deletions

diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json
index baed03f0fe..4f899bf7d6 100644
--- a/keyboards/z12/info.json
+++ b/keyboards/z12/info.json
@@ -21,21 +21,21 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
 
-                {"x": 0, "y": 0.5},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 0.5},
+                {"x": 0, "y": 0.5, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 0.5, "matrix": [1, 3]},
 
-                {"x": 0.5, "y": 2},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
+                {"x": 0.5, "y": 2, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2, "matrix": [2, 2]},
 
-                {"x": 0.5, "y": 3},
-                {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3}
+                {"x": 0.5, "y": 3, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3, "matrix": [3, 2]}
             ]
         }
     }
diff --git a/keyboards/z12/z12.c b/keyboards/z12/z12.c
index 2af8836cab..3edc9128e4 100644
--- a/keyboards/z12/z12.c
+++ b/keyboards/z12/z12.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "z12.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/z12/z12.h b/keyboards/z12/z12.h
deleted file mode 100644
index 0ea6c303f7..0000000000
--- a/keyboards/z12/z12.h
+++ /dev/null
@@ -1,34 +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( \
-             BN4, BN2,      \
-        SW7, BN3, BN1, SW8, \
-        SW4, SW5, SW6,      \
-        SW3, SW2, SW1       \
-    ) \
-    { \
-        { ___, BN4, BN2, ___ }, \
-        { SW7, BN3, BN1, SW8 }, \
-        { SW4, SW5, SW6, ___ }, \
-        { SW3, SW2, SW1, ___ }, \
-    }