3 files changed, 12 insertions, 37 deletions
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index 44a674620d..da9f91c5f5 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -17,25 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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 { F4, B6, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, D7, D4, D0 }
-#define MATRIX_ROW_PINS_RIGHT { F7, B5, B3, B2, B6 }
-#define MATRIX_COL_PINS_RIGHT { F6, B1, E6, D7, C6, D4, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
index 6ba7d24197..8ae75ee34b 100644
--- a/keyboards/kb58/info.json
+++ b/keyboards/kb58/info.json
@@ -8,8 +8,19 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F7", "B1", "D7", "D4", "D0"],
+        "rows": ["F4", "B6", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
-        "soft_serial_pin": "D2"
+        "soft_serial_pin": "D2",
+        "matrix_pins": {
+            "right": {
+                "cols": ["F6", "B1", "E6", "D7", "C6", "D4", "D0"],
+                "rows": ["F7", "B5", "B3", "B2", "B6"]
+            }
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/kb58/kb58.c b/keyboards/kb58/kb58.c
deleted file mode 100644
index 5d189fa321..0000000000
--- a/keyboards/kb58/kb58.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 beanaccle
- *
- * 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 "kb58.h"