4 files changed, 6 insertions, 53 deletions
diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h
deleted file mode 100644
index 20163dedc5..0000000000
--- a/keyboards/generic_panda/panda65_01/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 generic_panda
-
-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/>.
-*/
-
-#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 { A9, A8, B15, A6, A4 }
-#define MATRIX_COL_PINS { A3, A10, B7, B6, B5, B4, B3, A15, A14, A2, A1, A0, F1, F0, B10, B11 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json
index 57fe2ea133..fe6292d80f 100644
--- a/keyboards/generic_panda/panda65_01/info.json
+++ b/keyboards/generic_panda/panda65_01/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6501",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["A3", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A2", "A1", "A0", "F1", "F0", "B10", "B11"],
+        "rows": ["A9", "A8", "B15", "A6", "A4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.c b/keyboards/generic_panda/panda65_01/panda65_01.c
deleted file mode 100644
index 15bf577426..0000000000
--- a/keyboards/generic_panda/panda65_01/panda65_01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 generic_panda
- *
- * 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 "panda65_01.h"
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.h b/keyboards/generic_panda/panda65_01/panda65_01.h
index ced6e9b196..0a4de225ab 100644
--- a/keyboards/generic_panda/panda65_01/panda65_01.h
+++ b/keyboards/generic_panda/panda65_01/panda65_01.h
@@ -47,7 +47,7 @@
     k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,             k314, k315, \
     k400,       k402,                   k406,                         k411,       k413, k414, k415  \
 ) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014  k015 },  \
+    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 },  \
     { k100,  KC_NO, k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k115 }, \
     { k200,  KC_NO, k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  KC_NO, k215 }, \
     { k300,  KC_NO, KC_NO, k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k314,  k315 }, \