4 files changed, 5 insertions, 41 deletions
diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index c9a5d49447..b5ed9415d5 100644
--- a/keyboards/unikeyboard/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/config.h
@@ -17,23 +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 { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #ifndef SELECT_SOFT_SERIAL_SPEED
 #define SELECT_SOFT_SERIAL_SPEED 3
 #endif
diff --git a/keyboards/unikeyboard/diverge3/diverge3.c b/keyboards/unikeyboard/diverge3/diverge3.c
deleted file mode 100644
index 4143b14275..0000000000
--- a/keyboards/unikeyboard/diverge3/diverge3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 IslandMan93
- *
- * 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 "diverge3.h"
diff --git a/keyboards/unikeyboard/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h
index c668bb29ef..c052bcb0fc 100644
--- a/keyboards/unikeyboard/diverge3/diverge3.h
+++ b/keyboards/unikeyboard/diverge3/diverge3.h
@@ -18,14 +18,6 @@
 
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
 #define XXX KC_NO
 
 // This a shortcut to help you visually see your layout.
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index c2caaca881..4aac244492 100644
--- a/keyboards/unikeyboard/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
@@ -8,6 +8,11 @@
     "pid": "0x1257",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D4", "D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "ROW2COL",
   "backlight": {
     "pin": "C6",
     "levels": 5,