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

2 files changed, 18 insertions, 36 deletions

diff --git a/keyboards/nightly_boards/octopad/info.json b/keyboards/nightly_boards/octopad/info.json
index 8aa4f08043..d166f96e35 100644
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -24,23 +24,24 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1, "y":0}, 
-			{"x":2, "y":0}, 
-			{"x":3.5, "y":0}, 
-			{"x":4.5, "y":0}, 
-			{"x":5.5, "y":0}, 
-			
-			{"x":1.25, "y":1.25}, 
-			{"x":2.25, "y":1.25}, 
-			{"x":3.25, "y":1.25}, 
-			{"x":4.25, "y":1.25}, 
-			
-			{"x":1.25, "y":2.25}, 
-			{"x":2.25, "y":2.25}, 
-			{"x":3.25, "y":2.25}, 
-			{"x":4.25, "y":2.25}
-			]
+                {"matrix": [2, 0], "x": 0, "y": 0},
+                {"matrix": [0, 4], "x": 1, "y": 0},
+                {"matrix": [2, 1], "x": 2, "y": 0},
+
+                {"matrix": [2, 2], "x": 3.5, "y": 0},
+                {"matrix": [1, 4], "x": 4.5, "y": 0},
+                {"matrix": [2, 3], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.25, "y": 1.25},
+                {"matrix": [0, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 4.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 2.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 2.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 2.25}
+            ]
         }
     }
 }
diff --git a/keyboards/nightly_boards/octopad/octopad.h b/keyboards/nightly_boards/octopad/octopad.h
index 941afd3f07..33cf8e0b68 100644
--- a/keyboards/nightly_boards/octopad/octopad.h
+++ b/keyboards/nightly_boards/octopad/octopad.h
@@ -18,22 +18,3 @@
 
 #include "quantum.h"
 #include "encoder_action.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( \
-    E00A, K04,   E00B,  E01A, K14,  E01B, \
-    K00,  K01,   K02,   K03,    \
-    K10,  K11,   K12,   K13    \
-\
-) { \
-    { K00,   K01,   K02,    K03,    K04   }, \
-    { K10,   K11,   K12,    K13,    K14   }, \
-    { E00A,  E00B,  E01A,   E01B,   KC_NO }  \
-}