Move small macropad-ish layouts to data driven (#20341)

10 files changed, 35 insertions, 80 deletions

diff --git a/keyboards/maple_computing/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h
deleted file mode 100644
index ef73a72053..0000000000
--- a/keyboards/maple_computing/6ball/6ball.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k05, k00, k01, \
-    k04, k03, k02 \
-) { \
-    { k00, k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index 38f127cffc..bed6b1fdda 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
@@ -18,13 +18,13 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0},
-                {"x":2, "y":0.5},
+                {"matrix": [0, 5], "x": 0, "y": 0.5},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0.5},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":2},
-                {"x":2, "y":1.5}
+                {"matrix": [0, 4], "x": 0, "y": 1.5},
+                {"matrix": [0, 3], "x": 1, "y": 2},
+                {"matrix": [0, 2], "x": 2, "y": 1.5}
             ]
         }
     }
diff --git a/keyboards/maple_computing/christmas_tree/christmas_tree.h b/keyboards/maple_computing/christmas_tree/christmas_tree.h
deleted file mode 100644
index 68eefca6a8..0000000000
--- a/keyboards/maple_computing/christmas_tree/christmas_tree.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k10, k20, k30, k40, k50 \
-) { \
-    { k00 }, \
-    { k10 }, \
-    { k20 }, \
-    { k30 }, \
-    { k40 }, \
-    { k50 } \
-}
diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index 3ef81f9fd3..0a19667957 100644
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
@@ -19,7 +19,16 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
+      "layout": [
+        {"matrix": [0, 0], "x": 1, "y": 0},
+
+        {"matrix": [1, 0], "x": 0.5, "y": 1},
+        {"matrix": [2, 0], "x": 1.5, "y": 1},
+
+        {"matrix": [3, 0], "x": 0, "y": 2},
+        {"matrix": [4, 0], "x": 1, "y": 2},
+        {"matrix": [5, 0], "x": 2, "y": 2}
+      ]
     }
   }
 }
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
index e9cf604e19..3b971cb673 100644
--- a/keyboards/maple_computing/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/info.json
@@ -21,9 +21,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 1], "x": 1, "y": 0},
+                {"matrix": [2, 2], "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/maple_computing/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h
deleted file mode 100644
index 444224d2b6..0000000000
--- a/keyboards/maple_computing/ivy/rev1/rev1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, \
-    K01, \
-    K02  \
-	) \
-	{ \
-		{ K00, KC_NO, KC_NO }, \
-		{ KC_NO, K01, KC_NO }, \
-		{ KC_NO, KC_NO, K02 }, \
-	}
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index 49f4c16bc9..fe882742c3 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
@@ -18,17 +18,17 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3}
             ]
         }
     }
diff --git a/keyboards/maple_computing/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h
deleted file mode 100644
index 54d72d5e54..0000000000
--- a/keyboards/maple_computing/launchpad/rev1/rev1.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    k00, k01, \
-    k10, k11, \
-    k20, k21, \
-    k30, k31 \
-) { \
-    { k00, k01 }, \
-    { k10, k11 }, \
-    { k20, k21 }, \
-    { k30, k31 } \
-}
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index fd4de0bcbf..ef80f02bfa 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
@@ -17,7 +17,14 @@
   "bootloader": "atmel-dfu",
   "layouts": {
       "LAYOUT": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0, "w":2}]
+          "layout": [
+              {"matrix": [0, 0], "x": 0, "y": 0},
+              {"matrix": [0, 1], "x": 1, "y": 0},
+              {"matrix": [0, 2], "x": 2, "y": 0},
+              {"matrix": [0, 3], "x": 3, "y": 0},
+              {"matrix": [0, 4], "x": 4, "y": 0},
+              {"matrix": [0, 5], "x": 5, "y": 0, "w": 2}
+          ]
       }
   }
 }
diff --git a/keyboards/maple_computing/the_ruler/the_ruler.h b/keyboards/maple_computing/the_ruler/the_ruler.h
deleted file mode 100644
index 171d21a072..0000000000
--- a/keyboards/maple_computing/the_ruler/the_ruler.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05 ) { \
-    { K00, K01, K02, K03, K04, K05 }  \
-}