3 files changed, 5 insertions, 33 deletions
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h
index 673e71eca8..c30966d9d2 100644
--- a/keyboards/x16/config.h
+++ b/keyboards/x16/config.h
@@ -16,23 +16,6 @@
 
 #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, F7, D6, B6 }
-#define MATRIX_COL_PINS { C7, C6, B4, D7 }
-
-/* 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/x16/info.json b/keyboards/x16/info.json
index b5e457d424..d1a900d7f5 100644
--- a/keyboards/x16/info.json
+++ b/keyboards/x16/info.json
@@ -8,6 +8,11 @@
         "pid": "0x016A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B4", "D7"],
+        "rows": ["E6", "F7", "D6", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "backlight": {
         "pin": "B5",
         "levels": 5
diff --git a/keyboards/x16/x16.c b/keyboards/x16/x16.c
deleted file mode 100644
index 82a2f65c68..0000000000
--- a/keyboards/x16/x16.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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 "x16.h"