12 files changed, 32 insertions, 21 deletions
diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h
index 6a05023423..d884b12680 100644
--- a/keyboards/rart/rart4x4/config.h
+++ b/keyboards/rart/rart4x4/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define ENCODERS_PAD_A { F6, D7 }
-#define ENCODERS_PAD_B { F5, E6 }
-
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json
index 1b01a4d226..ac3014fe7a 100644
--- a/keyboards/rart/rart4x4/info.json
+++ b/keyboards/rart/rart4x4/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F6", "pin_b": "F5"},
+            {"pin_a": "D7", "pin_b": "E6"}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["ortho_4x4"],
diff --git a/keyboards/rart/rart75/config.h b/keyboards/rart/rart75/config.h
index 14d8f62893..eb5b0be422 100644
--- a/keyboards/rart/rart75/config.h
+++ b/keyboards/rart/rart75/config.h
@@ -30,6 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define ENCODERS_PAD_A { E6 }
-#define ENCODERS_PAD_B { B0 }
diff --git a/keyboards/rart/rart75/info.json b/keyboards/rart/rart75/info.json
index 81781cdb7e..40c5f39beb 100644
--- a/keyboards/rart/rart75/info.json
+++ b/keyboards/rart/rart75/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0075",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "E6", "pin_b": "B0"}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index dec3ab7cc2..f6817e71ce 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define ENCODERS_PAD_A { C1 }
-#define ENCODERS_PAD_B { C2 }
-#define ENCODER_RESOLUTION 4 //default/suggested
-
 #define RGB_DI_PIN C0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index a7ac977112..27984a03d7 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5575",
         "device_version": "0.0.3"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C1", "pin_b": "C2"}
+        ]
+    },
     "indicators": {
         "caps_lock": "D4",
         "on_state": 0
diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h
index 1bb4ae5263..0b08f0322f 100644
--- a/keyboards/rart/rart75m/config.h
+++ b/keyboards/rart/rart75m/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C7, B3, B1, B0, D3, D2 }
 #define MATRIX_COL_PINS { B2, D4, F0, C6, F1, D7, F4, E6, F5, B4, F6, B5, F7, B6 }
 
-#define ENCODERS_PAD_B { B7 }
-#define ENCODERS_PAD_A { D6 }
-#define ENCODER_RESOLUTION 2 //default/suggested
-
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json
index 094bb55b8d..1d0f0e2358 100644
--- a/keyboards/rart/rart75m/info.json
+++ b/keyboards/rart/rart75m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6075",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B7", "pin_b": "D6", "resolution": 2}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h
index facb9f1486..aee0fdd862 100644
--- a/keyboards/rart/rartland/config.h
+++ b/keyboards/rart/rartland/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B4, A7, A5, A6, C3 }
 #define MATRIX_COL_PINS { B0, A1, B1, A2, B2, A3, B3, A4, C7, C6, D0, C5, D1, C4 }
 
-#define ENCODERS_PAD_B { D5 }
-#define ENCODERS_PAD_A { C2 }
-#define ENCODER_RESOLUTION 2 //default/suggested
-
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json
index 8dbc85f13f..5cfc6b7b70 100644
--- a/keyboards/rart/rartland/info.json
+++ b/keyboards/rart/rartland/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6065",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D5", "pin_b": "C2", "resolution": 2}
+        ]
+    },
     "indicators": {
         "caps_lock": "A0",
         "on_state": 0
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h
index 5a8d6f7849..4a8e14be49 100644
--- a/keyboards/rart/rartpad/config.h
+++ b/keyboards/rart/rartpad/config.h
@@ -31,9 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define ENCODERS_PAD_A { B3, F5 }
-#define ENCODERS_PAD_B { B1, F4 }
-
 #define RGB_DI_PIN F7
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json
index 03918a6886..016b0c49c8 100644
--- a/keyboards/rart/rartpad/info.json
+++ b/keyboards/rart/rartpad/info.json
@@ -8,6 +8,12 @@
       "pid": "0x0050",
       "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "B3", "pin_b": "B1"},
+      {"pin_a": "F5", "pin_b": "F4"}
+    ]
+  },
   "indicators": {
       "caps_lock": "D7"
   },