3 files changed, 5 insertions, 22 deletions
diff --git a/keyboards/chavdai40/rev1/config.h b/keyboards/chavdai40/rev1/config.h
index 9918802434..277219f16d 100644
--- a/keyboards/chavdai40/rev1/config.h
+++ b/keyboards/chavdai40/rev1/config.h
@@ -22,9 +22,3 @@
 
 /* usb power settings */
 #define USB_MAX_POWER_CONSUMPTION 100
-
-#define MATRIX_ROW_PINS { A0, A15, B5, B6 }
-#define MATRIX_COL_PINS { B8, B4, B3, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/chavdai40/rev1/info.json b/keyboards/chavdai40/rev1/info.json
index 9f345a3ae7..0e518b6de0 100644
--- a/keyboards/chavdai40/rev1/info.json
+++ b/keyboards/chavdai40/rev1/info.json
@@ -3,6 +3,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B8", "B4", "B3", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A0", "A15", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "STM32F042",
     "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/chavdai40/rev1/rev1.c b/keyboards/chavdai40/rev1/rev1.c
deleted file mode 100644
index 116c301c2b..0000000000
--- a/keyboards/chavdai40/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 t-miyajima
- *
- * 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 "rev1.h"