5 files changed, 6 insertions, 24 deletions
diff --git a/keyboards/adm42/adm42.c b/keyboards/adm42/adm42.c
deleted file mode 100644
index 0cae6c9ab5..0000000000
--- a/keyboards/adm42/adm42.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2022 Lorenzo Leonini
- * SPDX-License-Identifier: GPL-2.0-only
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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 "adm42.h"
diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
index 03749906e8..af23da4c66 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-
-#define DIODE_DIRECTION ROW2COL
-
 #define TAP_CODE_DELAY 1
 
 #if defined(CONSOLE_ENABLE)
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 3596cdb446..5d518c3b86 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -9,6 +9,11 @@
         "pid": "0xE873",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["C7", "D5", "D3", "D2"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index fa2bcb3e43..73a212910a 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_ROW_PINS { C7, D5, D3, D2 }
-
 #define ADM42_LED E6
 
 #define RGB_DI_PIN B7
diff --git a/keyboards/adm42/rev4/rev4.c b/keyboards/adm42/rev4/rev4.c
index 2e22004f96..623b5cb5a3 100644
--- a/keyboards/adm42/rev4/rev4.c
+++ b/keyboards/adm42/rev4/rev4.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 led_config_t g_led_config = {
     {