6 files changed, 19 insertions, 62 deletions
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 6a6713557b..c7fcc504e3 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -18,49 +18,18 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 8
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define DIRECT_PINS                        \
-    {                                      \
-        { D4, D2, E6, B6, D7, C6, C7, B7 } \
-    }
-
 // These pins are not broken out, and cannot be used normally.
 // They are set as output and pulled high, by default
 #define UNUSABLE_PINS \
     { B4, D6, F1, F5, F6, F7 }
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 #define USB_MAX_POWER_CONSUMPTION 100
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 3
-
 #define RGB_DI_PIN B5
 #define RGBLED_NUM 4
 #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index f672336c25..c8889f59f9 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -8,17 +8,27 @@
         "pid": "0x4D6F",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"]
+        ]
+    },
     "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/keymaps/default/keymap.c b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
index 8145ffb1c3..29d81b8061 100644
--- a/keyboards/ploopyco/mouse/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
@@ -17,8 +17,6 @@
  */
 #include QMK_KEYBOARD_H
 
-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(/* Base */
                  C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, C(KC_V), KC_BTN4, KC_BTN5, DPI_CONFIG)
diff --git a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
index 056a1f7903..cf0b57d433 100644
--- a/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
@@ -17,8 +17,6 @@
  */
 #include QMK_KEYBOARD_H
 
-// safe range starts at `PLOOPY_SAFE_RANGE` instead.
-
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
diff --git a/keyboards/ploopyco/mouse/mouse.h b/keyboards/ploopyco/mouse/mouse.h
index 8383049aa5..9123315fd4 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 {
@@ -44,17 +41,8 @@ extern keyboard_config_t keyboard_config;
 extern uint16_t          dpi_array[];
 
 enum ploopy_keycodes {
-#ifdef VIA_ENABLE
-    DPI_CONFIG = USER00,
-#else
-    DPI_CONFIG = SAFE_RANGE,
-#endif
+    DPI_CONFIG = QK_KB_0,
     DRAG_SCROLL,
-#ifdef VIA_ENABLE
-    PLOOPY_SAFE_RANGE = SAFE_RANGE,
-#else
-    PLOOPY_SAFE_RANGE,
-#endif
 };
 
 bool encoder_update_user(uint8_t index, bool clockwise);
diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk
index 840b5eba39..8d62f78ed7 100644
--- a/keyboards/ploopyco/mouse/rules.mk
+++ b/keyboards/ploopyco/mouse/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
 # Processor frequency
 F_CPU = 8000000
 
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #