4 files changed, 19 insertions, 89 deletions
diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h
index 7c5a907467..e03d0cfcbb 100644
--- a/keyboards/earth_rover/config.h
+++ b/keyboards/earth_rover/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, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* 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/earth_rover/earth_rover.c b/keyboards/earth_rover/earth_rover.c
deleted file mode 100644
index c12eaa8c0e..0000000000
--- a/keyboards/earth_rover/earth_rover.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 k.bigwheel
- *
- * 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 "earth_rover.h"
diff --git a/keyboards/earth_rover/earth_rover.h b/keyboards/earth_rover/earth_rover.h
deleted file mode 100644
index a0676beeb2..0000000000
--- a/keyboards/earth_rover/earth_rover.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 k.bigwheel
- *
- * 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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-// clang-format off
-#define LAYOUT( \
-    k00, k01, \
-    k10, k12, k13, k14, \
-    k20, k22, k23, k24, \
-    k30, k32, k33, k34 \
-) { \
-    { KC_NO, k00, k01, KC_NO }, \
-    { k10,   k12, k13, k14   }, \
-    { k20,   k22, k23, k24   }, \
-    { k30,   k32, k33, k34   }, \
-}
-// clang-format on
diff --git a/keyboards/earth_rover/info.json b/keyboards/earth_rover/info.json
index 429c9b1cbd..f53eb4d610 100644
--- a/keyboards/earth_rover/info.json
+++ b/keyboards/earth_rover/info.json
@@ -8,28 +8,33 @@
         "pid": "0xEE11",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k10", "x": 1.25, "y": 0},
-                {"label": "k20", "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
 
-                {"label": "k01", "x": 0, "y": 1.25},
-                {"label": "k11", "x": 1.25, "y": 1.25},
-                {"label": "k21", "x": 2.25, "y": 1.25},
-                {"label": "k31", "x": 3.5, "y": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
 
-                {"label": "k02", "x": 0, "y": 2.25},
-                {"label": "k12", "x": 1.25, "y": 2.25},
-                {"label": "k22", "x": 2.25, "y": 2.25},
-                {"label": "k32", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
 
-                {"label": "k03", "x": 0, "y": 3.25},
-                {"label": "k13", "x": 1.25, "y": 3.25},
-                {"label": "k23", "x": 2.25, "y": 3.25},
-                {"label": "k33", "x": 3.5, "y": 3.25}
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25}
             ]
         }
     }