3 files changed, 5 insertions, 23 deletions
diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h
index a03f212f37..30b3906f0d 100644
--- a/keyboards/macro1/config.h
+++ b/keyboards/macro1/config.h
@@ -16,14 +16,6 @@
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
-#define MATRIX_COL_PINS { D3, D4, D6, D7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
index ae4de40310..5fb86fecb7 100644
--- a/keyboards/macro1/info.json
+++ b/keyboards/macro1/info.json
@@ -8,6 +8,11 @@
       "pid": "0x9999",
       "device_version": "0.0.1"
     },
+    "matrix_pins": {
+      "cols": ["D3", "D4", "D6", "D7"],
+      "rows": ["E6", "B7", "D0", "D1", "D2", "B3"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
       "rotary": [
         {"pin_a": "F0", "pin_b": "F1"}
diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
index f1fbed1d15..a9cba4ecfa 100644
--- a/keyboards/macro1/macro1.c
+++ b/keyboards/macro1/macro1.c
@@ -14,18 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "macro1.h"
-
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}