6 files changed, 24 insertions, 46 deletions
diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h
index b4b891321b..272c37ff50 100644
--- a/keyboards/minimacro5/config.h
+++ b/keyboards/minimacro5/config.h
@@ -17,37 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 5
-
-/*
- * 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)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-// #define MATRIX_ROW_PINS { D0, D5 }
-// #define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS {   \
-    { F4, B6, B2, D7, B4 } \
-}
 //speed for double tap
 #define TAPPING_TERM 200
 
-
-/* rotary encoder 1,2,3 closest to usb port is 0*/
-#define ENCODERS_PAD_B { D3, F6, F7, D4, C6}
-#define ENCODERS_PAD_A { F5, D2, D1, D0, E6}
-#define ENCODER_RESOLUTION 2 //default/suggested
-
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B5
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json
index 0dba5c0e6c..7c6748c574 100644
--- a/keyboards/minimacro5/info.json
+++ b/keyboards/minimacro5/info.json
@@ -8,9 +8,31 @@
     "pid": "0x0007",
     "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D3", "pin_b": "F5", "resolution": 2},
+      {"pin_a": "F6", "pin_b": "D2", "resolution": 2},
+      {"pin_a": "F7", "pin_b": "D1", "resolution": 2},
+      {"pin_a": "D4", "pin_b": "D0", "resolution": 2},
+      {"pin_a": "C6", "pin_b": "E6", "resolution": 2}
+    ]
+  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
+  "matrix_pins": {
+    "direct": [
+      ["F4", "B6", "B2", "D7", "B4"]
+    ]
+  },
   "layouts": {
     "LAYOUT_ortho_1x5": {
-      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0}]
+      "layout": [
+        {"x":0, "y":0, "matrix": [0, 0]},
+        {"x":1, "y":0, "matrix": [0, 1]},
+        {"x":2, "y":0, "matrix": [0, 2]},
+        {"x":3, "y":0, "matrix": [0, 3]},
+        {"x":5, "y":0, "matrix": [0, 4]}
+      ]
     }
   }
 }
diff --git a/keyboards/minimacro5/keymaps/devdev/keymap.c b/keyboards/minimacro5/keymaps/devdev/keymap.c
index 3c203fcc37..cb183a91b7 100644
--- a/keyboards/minimacro5/keymaps/devdev/keymap.c
+++ b/keyboards/minimacro5/keymaps/devdev/keymap.c
@@ -114,7 +114,7 @@ void keyboard_post_init_user(void) {
 }
 
 // Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
     // Tap once for Escape, twice for Caps Lock
     [TD_TO_DISCORD] = ACTION_TAP_DANCE_LAYER_MOVE(KC_MUTE, _DISCORD),
 	[TD_TO_PHOTOSHOP] = ACTION_TAP_DANCE_LAYER_MOVE(KC_E, _PHOTOSHOP),
diff --git a/keyboards/minimacro5/minimacro5.c b/keyboards/minimacro5/minimacro5.c
deleted file mode 100644
index 7f9c5af1c7..0000000000
--- a/keyboards/minimacro5/minimacro5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "minimacro5.h"
diff --git a/keyboards/minimacro5/minimacro5.h b/keyboards/minimacro5/minimacro5.h
deleted file mode 100644
index 2d61ed893b..0000000000
--- a/keyboards/minimacro5/minimacro5.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_1x5( \
-    k01, k02, k03, k04, k05\
-  ) { \
-    { k01, k02, k03, k04, k05 } \
-}
diff --git a/keyboards/minimacro5/rules.mk b/keyboards/minimacro5/rules.mk
index 2bb7b0b50a..897a356cf6 100644
--- a/keyboards/minimacro5/rules.mk
+++ b/keyboards/minimacro5/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #