6 files changed, 15 insertions, 30 deletions
diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index d6129ce2ed..2e0110934b 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B6, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { D1, D0, F6 }
-
-/* 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/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
index e1dda21feb..c721a3f390 100644
--- a/keyboards/keyhive/navi10/rev0/info.json
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D0", "F6"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 0b7c4cf002..2e0110934b 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B6, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { D4, C6, B1 }
-
-/* 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/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
index 1b44b7d70f..a0e51a3fb8 100644
--- a/keyboards/keyhive/navi10/rev2/info.json
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.2"
     },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }
diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 93ce1cdc42..2e0110934b 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
@@ -17,16 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS \
-    { B6, B2, B3, B4 }
-#define MATRIX_COL_PINS \
-    { D4, E6, B1 }
-
-/* 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/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
index 2d7d9f1f84..704ca05e91 100644
--- a/keyboards/keyhive/navi10/rev3/info.json
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -2,6 +2,11 @@
     "usb": {
         "device_version": "0.0.3"
     },
+    "matrix_pins": {
+        "cols": ["D4", "E6", "B1"],
+        "rows": ["B6", "B2", "B3", "B4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina"
 }