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

2 files changed, 16 insertions, 29 deletions

diff --git a/keyboards/keyhive/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index ec54b59f20..0418dee767 100755
--- a/keyboards/keyhive/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
@@ -17,16 +17,3 @@
 #define SET_LED_MAGENTA (RED_LED_ON();  GRN_LED_OFF(); BLU_LED_ON(); )
 #define SET_LED_CYAN    (RED_LED_OFF(); GRN_LED_ON();  BLU_LED_ON(); )
 #define SET_LED_WHITE   (RED_LED_ON();  GRN_LED_ON();  BLU_LED_ON(); )
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-  k13, k14, k15, k16, \
-  k09, k10, k11, k12, \
-  k05, k06, k07, k08, \
-  k01, k02, k03, k04  \
-) \
-{ \
-	{ k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16 } \
-}
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index 693b836ede..639edee28d 100644
--- a/keyboards/keyhive/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
@@ -13,25 +13,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [0, 12], "x": 0, "y": 0},
+                {"matrix": [0, 13], "x": 1, "y": 0},
+                {"matrix": [0, 14], "x": 2, "y": 0},
+                {"matrix": [0, 15], "x": 3, "y": 0},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"matrix": [0, 8], "x": 0, "y": 1},
+                {"matrix": [0, 9], "x": 1, "y": 1},
+                {"matrix": [0, 10], "x": 2, "y": 1},
+                {"matrix": [0, 11], "x": 3, "y": 1},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"matrix": [0, 4], "x": 0, "y": 2},
+                {"matrix": [0, 5], "x": 1, "y": 2},
+                {"matrix": [0, 6], "x": 2, "y": 2},
+                {"matrix": [0, 7], "x": 3, "y": 2},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 3},
+                {"matrix": [0, 1], "x": 1, "y": 3},
+                {"matrix": [0, 2], "x": 2, "y": 3},
+                {"matrix": [0, 3], "x": 3, "y": 3}
             ]
         }
     }