From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 19 Feb 2023 18:55:12 +1100
Subject: Move layouts for direct_pins boards to data driven (#19872)

---
 keyboards/ploopyco/mouse/info.json                 | 16 ++++++++--------
 keyboards/ploopyco/mouse/mouse.h                   |  3 ---
 keyboards/ploopyco/trackball/info.json             | 10 +++++-----
 keyboards/ploopyco/trackball/trackball.h           |  3 ---
 keyboards/ploopyco/trackball_mini/info.json        | 10 +++++-----
 keyboards/ploopyco/trackball_mini/trackball_mini.h |  3 ---
 keyboards/ploopyco/trackball_nano/info.json        |  2 +-
 keyboards/ploopyco/trackball_nano/trackball_nano.h |  2 --
 8 files changed, 19 insertions(+), 30 deletions(-)

(limited to 'keyboards/ploopyco')

diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index 522f996ef8..c8889f59f9 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -21,14 +21,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0, "h":2},
-                {"x":2, "y":0, "h":2},
-                {"x":3, "y":0.25, "h":1.25},
-                {"x":4, "y":0, "h":2},
-                {"x":5, "y":0, "h":2},
-                {"x":0, "y":0},
-                {"x":0, "y":1},
-                {"x":3, "y":1.5}
+                {"x":1, "y":0, "h":2, "matrix": [0, 6]},
+                {"x":2, "y":0, "h":2, "matrix": [0, 0]},
+                {"x":3, "y":0.25, "h":1.25, "matrix": [0, 1]},
+                {"x":4, "y":0, "h":2, "matrix": [0, 2]},
+                {"x":5, "y":0, "h":2, "matrix": [0, 5]},
+                {"x":0, "y":0, "matrix": [0, 3]},
+                {"x":0, "y":1, "matrix": [0, 4]},
+                {"x":3, "y":1.5, "matrix": [0, 7]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h
index 8383049aa5..508a883169 100644
--- a/keyboards/ploopyco/mouse/mouse.h
+++ b/keyboards/ploopyco/mouse/mouse.h
@@ -30,9 +30,6 @@
 
 void process_wheel(void);
 
-#define LAYOUT(BLL, BL, BM, BR, BRR, BF, BB, BDPI) \
-    { {BL, BM, BR, BF, BB, BRR, BLL, BDPI}, }
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index 4d5fb44fac..a1f9c53284 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -14,11 +14,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "h":2},
-                {"x":1, "y":0.25, "h":1.5},
-                {"x":2, "y":0, "h":2},
-                {"x":3.5, "y":0, "h":2},
-                {"x":4.5, "y":0, "h":2}
+                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
+                {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]},
+                {"x":2, "y":0, "h":2, "matrix": [0, 2]},
+                {"x":3.5, "y":0, "h":2, "matrix": [0, 3]},
+                {"x":4.5, "y":0, "h":2, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball/trackball.h b/keyboards/ploopyco/trackball/trackball.h
index 8452a78ee7..e2e46b2c97 100644
--- a/keyboards/ploopyco/trackball/trackball.h
+++ b/keyboards/ploopyco/trackball/trackball.h
@@ -33,9 +33,6 @@
 #define OPT_ENC1_MUX 0
 #define OPT_ENC2_MUX 4
 
-#define LAYOUT(BL, BM, BR, BF, BB) \
-    { {BL, BM, BR, BF, BB}, }
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json
index 1c8ed6351a..e3daea0575 100644
--- a/keyboards/ploopyco/trackball_mini/info.json
+++ b/keyboards/ploopyco/trackball_mini/info.json
@@ -16,11 +16,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "h":2},
-                {"x":1, "y":0.25, "h":1.5},
-                {"x":2, "y":0, "h":2},
-                {"x":3.5, "y":0, "h":2},
-                {"x":4.5, "y":0, "h":2}
+                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
+                {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]},
+                {"x":2, "y":0, "h":2, "matrix": [0, 2]},
+                {"x":3.5, "y":0, "h":2, "matrix": [0, 3]},
+                {"x":4.5, "y":0, "h":2, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.h b/keyboards/ploopyco/trackball_mini/trackball_mini.h
index 3af2a49b5e..3410751cb0 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.h
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.h
@@ -31,9 +31,6 @@
 
 void process_wheel(void);
 
-#define LAYOUT(BL, BM, BR, BF, BB) \
-    { {BL, BM, BR, BF, BB}, }
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json
index 610efd27b3..522ff43d99 100644
--- a/keyboards/ploopyco/trackball_nano/info.json
+++ b/keyboards/ploopyco/trackball_nano/info.json
@@ -14,7 +14,7 @@
      "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0}
+                {"x":0, "y":0, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h
index d971627fc6..4cdbc7f11f 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.h
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h
@@ -21,8 +21,6 @@
 
 #include "quantum.h"
 
-#define LAYOUT(k00) {{ k00 }}
-
 typedef union {
   uint32_t raw;
   struct {
-- 
cgit v1.2.3