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

6 files changed, 19 insertions, 94 deletions

diff --git a/keyboards/0xcb/1337/1337.c b/keyboards/0xcb/1337/1337.c
index 85781209b3..d5937540b2 100644
--- a/keyboards/0xcb/1337/1337.c
+++ b/keyboards/0xcb/1337/1337.c
@@ -14,7 +14,7 @@ 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 "1337.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/0xcb/1337/1337.h b/keyboards/0xcb/1337/1337.h
deleted file mode 100644
index e1f238c126..0000000000
--- a/keyboards/0xcb/1337/1337.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 0xCB - Conor Burns
-
-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.
- */
-// clang-format off
- #define LAYOUT( \
-     KA1, KA2, KA3, \
-     KB1, KB2, KB3, \
-     KC1, KC2, KC3 \
- ) \
- { \
-     { KA1, KA2, KA3 }, \
-     { KB1, KB2, KB3 }, \
-     { KC1, KC2, KC3 } \
- }
-// clang-format on
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index ca04777536..fb4480e1b0 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -20,15 +20,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":0, "y":1},
-        {"x":1, "y":1},
-        {"x":2, "y":1},
-        {"x":0, "y":2},
-        {"x":1, "y":2},
-        {"x":2, "y":2}
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":0, "y":1, "matrix": [1, 0]},
+        {"x":1, "y":1, "matrix": [1, 1]},
+        {"x":2, "y":1, "matrix": [1, 2]},
+        {"x":0, "y":2, "matrix": [2, 0]},
+        {"x":1, "y":2, "matrix": [2, 1]},
+        {"x":2, "y":2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 0d9585dbb5..646b4dc882 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@@ -22,15 +22,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k03", "x": 0, "y": 0},
-                {"label": "k02", "x": 1, "y": 0},
-                {"label": "k01", "x": 2, "y": 0},
-                {"label": "k00", "x": 3, "y": 0},
+                {"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]},
 
-                {"label": "k13", "x": 0, "y": 1},
-                {"label": "k12", "x": 1, "y": 1},
-                {"label": "k11", "x": 2, "y": 1},
-                {"label": "k10", "x": 3, "y": 1}
+                {"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]}
             ]
         }
     }
diff --git a/keyboards/0xcb/tutelpad/tutelpad.c b/keyboards/0xcb/tutelpad/tutelpad.c
index 25c2d22219..36671d5bd1 100644
--- a/keyboards/0xcb/tutelpad/tutelpad.c
+++ b/keyboards/0xcb/tutelpad/tutelpad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tutelpad.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 
diff --git a/keyboards/0xcb/tutelpad/tutelpad.h b/keyboards/0xcb/tutelpad/tutelpad.h
deleted file mode 100644
index 0115c50fa4..0000000000
--- a/keyboards/0xcb/tutelpad/tutelpad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 ItsFiremanSam
- *
- * 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 is 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.
- */
-#define LAYOUT( \
-    k00, k01, k02, k03, \
-      k10,  k11,  k12,  k13  \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }  \
-}