10 files changed, 26 insertions, 18 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h
index cde82e7341..7bf2b1b33b 100644
--- a/keyboards/merge/iso_macro/config.h
+++ b/keyboards/merge/iso_macro/config.h
@@ -22,8 +22,3 @@
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-
-#define ENCODERS_PAD_A { F0, D0 }
-#define ENCODERS_PAD_B { F1, D1 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index 123438a5be..bc4269755f 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -8,6 +8,12 @@
         "pid": "0x1200",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F0", "pin_b": "F1"},
+            {"pin_a": "D0", "pin_b": "D1"}
+        ]
+    },
     "backlight": {
         "pin": "B7"
     },
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 488b2cfed3..9dcfb6e074 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -39,7 +39,3 @@
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-
-#define ENCODERS_PAD_A { F5 }
-#define ENCODERS_PAD_B { F6 }
-#define ENCODER_RESOLUTION 4
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index d42f88c794..55b68a4510 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,11 @@
     "pid": "0x5543",
     "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F5", "pin_b": "F6"}
+    ]
+  },
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 69500ee603..c249a1816a 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -42,6 +42,3 @@
 #ifdef AUDIO_ENABLE
   #define STARTUP_SONG SONG(STARTUP_SOUND)
 #endif
-
-#define ENCODERS_PAD_A { B4 }
-#define ENCODERS_PAD_B { B5 }
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index 3c57c77492..e548d63151 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3222",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index bba359e02f..238e5f6d43 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -42,6 +42,3 @@
 #ifdef AUDIO_ENABLE
   #define STARTUP_SONG SONG(STARTUP_SOUND)
 #endif
-
-#define ENCODERS_PAD_A { B4 }
-#define ENCODERS_PAD_B { B5 }
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index a467a97c77..e3e1359c92 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3241",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 4cbb583321..6d21adc774 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -24,6 +24,3 @@
 
 #define SPLIT_USB_DETECT
 #define SPLIT_MODS_ENABLE
-
-#define ENCODERS_PAD_A { B4 }
-#define ENCODERS_PAD_B { B5 }
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 11ccd102a5..1363705253 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -11,6 +11,11 @@
     "backlight": {
         "pin": "C6"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "B5"}
+        ]
+    },
     "split": {
         "soft_serial_pin": "D2"
     },