6 files changed, 17 insertions, 9 deletions
diff --git a/keyboards/custommk/evo70/config.h b/keyboards/custommk/evo70/config.h
index d73f5b1823..633cbec155 100644
--- a/keyboards/custommk/evo70/config.h
+++ b/keyboards/custommk/evo70/config.h
@@ -21,9 +21,6 @@
 
 #define OLED_DISABLE_TIMEOUT
 
-#define ENCODERS_PAD_A { C7 }
-#define ENCODERS_PAD_B { D5 }
-#define ENCODER_RESOLUTION 2
 #define TAP_CODE_DELAY 10
 
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index 824edd4277..1ea89ad92a 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -9,6 +9,11 @@
         "pid": "0xFAB5",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C7", "pin_b": "D5", "resolution": 2}
+        ]
+    },
     "backlight": {
         "pin": "B5",
         "levels": 17,
diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
index 5f6113bc68..c5e7661c65 100644
--- a/keyboards/custommk/genesis/rev1/config.h
+++ b/keyboards/custommk/genesis/rev1/config.h
@@ -24,9 +24,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define ENCODERS_PAD_A { F6, D2 }
-#define ENCODERS_PAD_B { F7, D1 }
-#define ENCODER_RESOLUTION 2
 #define TAP_CODE_DELAY 10
 
 #define RGB_DI_PIN E6
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index 3ff1d77904..aaab705432 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -8,6 +8,12 @@
         "pid": "0xFAB0",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F7", "resolution": 2},
+            {"pin_a": "D2", "pin_b": "D1", "resolution": 2}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index f034eab579..f152f723fe 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -24,9 +24,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define ENCODERS_PAD_A { F6, D2 }
-#define ENCODERS_PAD_B { F7, D1 }
-#define ENCODER_RESOLUTION 2
 #define TAP_CODE_DELAY 10
 
 #define RGB_DI_PIN E6
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 6ba57648cb..45b83c512a 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -8,6 +8,12 @@
         "pid": "0xFAB1",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F7", "resolution": 2},
+            {"pin_a": "D2", "pin_b": "D1", "resolution": 2}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {