3 files changed, 5 insertions, 37 deletions
diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index fbee1e1858..8d13c9fad8 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -16,24 +16,7 @@
 
 #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 MATRIX_ROW_PINS { E6, B7, D4, F0, D6, D7 }
-#define MATRIX_COL_PINS { D1, D0, F7, F6, F5, D5, D3, D2, C7, C6, B5, F4, F1, B4, B0 }
-
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
     #define RGBLED_NUM 125
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
@@ -50,4 +33,3 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 22a09c541e..c90fa21e3e 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -8,6 +8,11 @@
         "pid": "0x087D",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F7", "F6", "F5", "D5", "D3", "D2", "C7", "C6", "B5", "F4", "F1", "B4", "B0"],
+        "rows": ["E6", "B7", "D4", "F0", "D6", "D7"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B6"
     },
diff --git a/keyboards/poker87d/poker87d.c b/keyboards/poker87d/poker87d.c
deleted file mode 100644
index 8faf286cff..0000000000
--- a/keyboards/poker87d/poker87d.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021  water <mfkiiyd@163.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "poker87d.h"
-
-