6 files changed, 16 insertions, 53 deletions
diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json
index c3ac841283..b0a9cf2a0d 100755
--- a/keyboards/melgeek/mach80/info.json
+++ b/keyboards/melgeek/mach80/info.json
@@ -45,7 +45,7 @@
                 {"x": 10, "y": 1.5},
                 {"x": 11, "y": 1.5},
                 {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2.0},
+                {"x": 13, "y": 1.5, "w": 2},
                 {"x": 15.25, "y": 1.5},
                 {"x": 16.25, "y": 1.5},
                 {"x": 17.25, "y": 1.5},
@@ -141,7 +141,7 @@
                 {"x": 10, "y": 1.5},
                 {"x": 11, "y": 1.5},
                 {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2.0},
+                {"x": 13, "y": 1.5, "w": 2},
                 {"x": 15.25, "y": 1.5},
                 {"x": 16.25, "y": 1.5},
                 {"x": 17.25, "y": 1.5},
diff --git a/keyboards/melgeek/mach80/mach80.c b/keyboards/melgeek/mach80/mach80.c
deleted file mode 100755
index 28d21b22b1..0000000000
--- a/keyboards/melgeek/mach80/mach80.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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 "mach80.h"
diff --git a/keyboards/melgeek/mach80/rev1/config.h b/keyboards/melgeek/mach80/rev1/config.h
index 62af5154e6..072419e163 100755
--- a/keyboards/melgeek/mach80/rev1/config.h
+++ b/keyboards/melgeek/mach80/rev1/config.h
@@ -16,23 +16,6 @@
 
 #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 { F0, F1, F4, F5, F6, E6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_MATRIX_LED_COUNT 97
 #define DRIVER_INDICATOR_LED_TOTAL 3
 
diff --git a/keyboards/melgeek/mach80/rev1/info.json b/keyboards/melgeek/mach80/rev1/info.json
new file mode 100644
index 0000000000..af9f7c2669
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev1/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
+    },
+    "diode_direction": "ROW2COL"
+}
diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h
index b42d96691a..10d3bde47a 100755
--- a/keyboards/melgeek/mach80/rev2/config.h
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -16,23 +16,6 @@
 
 #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 { F0, F1, F4, F5, F6, E6 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
 #define RGB_MATRIX_LED_COUNT 94
 #define DRIVER_INDICATOR_LED_TOTAL 3
 
diff --git a/keyboards/melgeek/mach80/rev2/info.json b/keyboards/melgeek/mach80/rev2/info.json
new file mode 100644
index 0000000000..af9f7c2669
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/info.json
@@ -0,0 +1,7 @@
+{
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
+        "rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
+    },
+    "diode_direction": "ROW2COL"
+}