3 files changed, 5 insertions, 24 deletions
diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h
deleted file mode 100644
index 427c62a66b..0000000000
--- a/keyboards/handwired/hwpm87/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 CAO THAI DUONG (@KD-MM2)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/*
- * 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 DIODE_DIRECTION ROW2COL
- 
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 }
diff --git a/keyboards/handwired/hwpm87/hwpm87.c b/keyboards/handwired/hwpm87/hwpm87.c
deleted file mode 100644
index 9edc09c971..0000000000
--- a/keyboards/handwired/hwpm87/hwpm87.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 CAO THAI DUONG (@KD-MM2)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "hwpm87.h"
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json
index 8654ea7561..a719ba5ef2 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B7", "F0", "F1", "D6", "C7", "B6", "F7", "F6", "F5", "F4"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+    },
+    "diode_direction": "ROW2COL",
     "indicators": {
         "caps_lock": "D5",
         "on_state": 0