7 files changed, 19 insertions, 26 deletions
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index eb01b1ad13..344ccf3fff 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -18,7 +18,6 @@
 
 #define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
-#define RGB_DI_PIN A7
 
 // PWM RGB Underglow Defines
 #define WS2812_PWM_DRIVER PWMD3
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 5bb1cc5ee8..0b8704885c 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -8,6 +8,10 @@
     "pid": "0xA372",
     "device_version": "0.0.2"
   },
+  "ws2812": {
+    "pin": "A7",
+    "driver": "pwm"
+  },
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
   "matrix_pins": {
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
index f81c11eb7d..38a6bb6887 100644
--- a/keyboards/geekboards/macropad_v2/rules.mk
+++ b/keyboards/geekboards/macropad_v2/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = pwm
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index 0a184388ae..0fea806b6f 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -1,10 +1,5 @@
 #pragma once
 
-
-#define MATRIX_ROW_PINS { B0, D4}
-#define MATRIX_COL_PINS { F7, F6, D2, D3}
-
-#define DIODE_DIRECTION COL2ROW
 #define LOCKING_SUPPORT_ENABL
 #define LOCKING_RESYNC_ENABLE
 
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index fdc0463e41..64a752d24f 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -8,21 +8,26 @@
         "pid": "0x1319",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "D2", "D3"],
+        "rows": ["B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "debounce": 3,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"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},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1}
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index f2d2301ec9..05b220250f 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -1,4 +1,5 @@
-#include "tester.h"
+#include "quantum.h"
+
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
diff --git a/keyboards/geekboards/tester/tester.h b/keyboards/geekboards/tester/tester.h
deleted file mode 100644
index 28c555f0b6..0000000000
--- a/keyboards/geekboards/tester/tester.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define LAYOUT( \
-      k00, k01, k02, k03,\
-      k10, k11, k12, k13\
-) \
-{ \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 } \
-}