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

3 files changed, 13 insertions, 42 deletions

diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index a38404cc97..ab1b8ae020 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -21,18 +21,18 @@
     "layouts": {
         "LAYOUT_ortho_4x3": {
             "layout": [
-                {"label":"K00 (B0,B4)", "x":0, "y":1},
-                {"label":"K01 (B0,B5)", "x":1, "y":1},
-                {"label":"K02 (B0,B6)", "x":2, "y":1},
-                {"label":"K10 (B1,B4)", "x":0, "y":2},
-                {"label":"K11 (B1,B5)", "x":1, "y":2},
-                {"label":"K12 (B1,B6)", "x":2, "y":2},
-                {"label":"K20 (B2,B4)", "x":0, "y":3},
-                {"label":"K21 (B2,B5)", "x":1, "y":3},
-                {"label":"K22 (B2,B6)", "x":2, "y":3},
-                {"label":"K30 (B3,B4)", "x":0, "y":4},
-                {"label":"K31 (B3,B5)", "x":1, "y":4},
-                {"label":"K32 (B3,B6)", "x":2, "y":4}
+                {"x":0, "y":1, "matrix": [0, 0]},
+                {"x":1, "y":1, "matrix": [0, 1]},
+                {"x":2, "y":1, "matrix": [0, 2]},
+                {"x":0, "y":2, "matrix": [1, 0]},
+                {"x":1, "y":2, "matrix": [1, 1]},
+                {"x":2, "y":2, "matrix": [1, 2]},
+                {"x":0, "y":3, "matrix": [2, 0]},
+                {"x":1, "y":3, "matrix": [2, 1]},
+                {"x":2, "y":3, "matrix": [2, 2]},
+                {"x":0, "y":4, "matrix": [3, 0]},
+                {"x":1, "y":4, "matrix": [3, 1]},
+                {"x":2, "y":4, "matrix": [3, 2]}
             ]
         }
     }
diff --git a/keyboards/splitkb/zima/zima.c b/keyboards/splitkb/zima/zima.c
index f39e3a39eb..2ac1f78d34 100644
--- a/keyboards/splitkb/zima/zima.c
+++ b/keyboards/splitkb/zima/zima.c
@@ -13,7 +13,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 "zima.h"
+#include "quantum.h"
 #include <stdio.h>
 
 #ifdef HAPTIC_ENABLE
diff --git a/keyboards/splitkb/zima/zima.h b/keyboards/splitkb/zima/zima.h
deleted file mode 100644
index dc492ef107..0000000000
--- a/keyboards/splitkb/zima/zima.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2019 Thomas Baart
- *
- * 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"
-
-#define LAYOUT_ortho_4x3( \
-    k00, k01, k02, \
-    k03, k04, k05, \
-    k06, k07, k08, \
-    k09, k10, k11  \
-   ) { \
-    {k00, k01, k02}, \
-    {k03, k04, k05}, \
-    {k06, k07, k08}, \
-    {k09, k10, k11} }