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

9 files changed, 28 insertions, 50 deletions

diff --git a/keyboards/8pack/8pack.c b/keyboards/8pack/8pack.c
deleted file mode 100644
index e89d7281de..0000000000
--- a/keyboards/8pack/8pack.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "8pack.h"
diff --git a/keyboards/8pack/8pack.h b/keyboards/8pack/8pack.h
deleted file mode 100644
index 1c4ffb55b8..0000000000
--- a/keyboards/8pack/8pack.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_8pack_rev11
-  #include "rev11.h"
-#endif
-
-#ifdef KEYBOARD_8pack_rev12
-  #include "rev12.h"
-#endif
\ No newline at end of file
diff --git a/keyboards/8pack/info.json b/keyboards/8pack/info.json
index fa33b2644f..63cc0e23de 100644
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@@ -14,19 +14,5 @@
       ["F4", "F5", "F6", "F7"],
       ["B1", "B3", "B2", "B6"]
     ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":3, "y":0},
-        {"x":0, "y":1},
-        {"x":1, "y":1},
-        {"x":2, "y":1},
-        {"x":3, "y":1}
-      ]
-    }
   }
 }
diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/info.json
index 90ac25f360..6d4d61fe13 100644
--- a/keyboards/8pack/rev11/info.json
+++ b/keyboards/8pack/rev11/info.json
@@ -1,5 +1,19 @@
 {
     "usb": {
         "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0, "matrix": [1, 3]},
+                {"x":1, "y":0, "matrix": [1, 2]},
+                {"x":2, "y":0, "matrix": [1, 1]},
+                {"x":3, "y":0, "matrix": [1, 0]},
+                {"x":0, "y":1, "matrix": [0, 3]},
+                {"x":1, "y":1, "matrix": [0, 2]},
+                {"x":2, "y":1, "matrix": [0, 1]},
+                {"x":3, "y":1, "matrix": [0, 0]}
+            ]
+        }
     }
 }
diff --git a/keyboards/8pack/rev11/rev11.c b/keyboards/8pack/rev11/rev11.c
deleted file mode 100644
index c54ecbe87e..0000000000
--- a/keyboards/8pack/rev11/rev11.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev11.h"
diff --git a/keyboards/8pack/rev11/rev11.h b/keyboards/8pack/rev11/rev11.h
deleted file mode 100644
index ebf8529ad0..0000000000
--- a/keyboards/8pack/rev11/rev11.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "8pack.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-	K10, K11, K12, K13 \
-) { \
-	{ K13, K12, K11, K10 }, \
-    { K03, K02, K01, K00 } \
-}
diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/info.json
index e557e4d307..05b1a290ae 100644
--- a/keyboards/8pack/rev12/info.json
+++ b/keyboards/8pack/rev12/info.json
@@ -1,5 +1,19 @@
 {
     "usb": {
         "device_version": "0.0.2"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0, "matrix": [0, 3]},
+                {"x":1, "y":0, "matrix": [0, 2]},
+                {"x":2, "y":0, "matrix": [0, 1]},
+                {"x":3, "y":0, "matrix": [0, 0]},
+                {"x":0, "y":1, "matrix": [1, 3]},
+                {"x":1, "y":1, "matrix": [1, 2]},
+                {"x":2, "y":1, "matrix": [1, 1]},
+                {"x":3, "y":1, "matrix": [1, 0]}
+            ]
+        }
     }
 }
diff --git a/keyboards/8pack/rev12/rev12.c b/keyboards/8pack/rev12/rev12.c
deleted file mode 100644
index b2d091af49..0000000000
--- a/keyboards/8pack/rev12/rev12.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev12.h"
diff --git a/keyboards/8pack/rev12/rev12.h b/keyboards/8pack/rev12/rev12.h
deleted file mode 100644
index 3efeb06de5..0000000000
--- a/keyboards/8pack/rev12/rev12.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "8pack.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-	K10, K11, K12, K13 \
-) { \
-    { K03, K02, K01, K00 }, \
-	{ K13, K12, K11, K10 } \
-}