4 files changed, 10 insertions, 6 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index b7cbf3b757..a247d1b367 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -19,9 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 
 #define TAP_CODE_DELAY 10
-#define ENCODER_RESOLUTION 4
-#define ENCODERS_PAD_A { F6 }
-#define ENCODERS_PAD_B { F5 }
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index 95170ee873..d34d7166bf 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -13,6 +13,11 @@
     "levels": 7,
     "breathing": true
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F6", "pin_b": "F5"}
+    ]
+  },
   "qmk_lufa_bootloader": {
     "led": "B0"
   },
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 0f517163e5..f77002e8ab 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define TAP_CODE_DELAY 10
-#define ENCODER_RESOLUTION 4
-#define ENCODERS_PAD_A { D0 }
-#define ENCODERS_PAD_B { D1 }
 // clang-format on
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index b6e5f01b27..a18bd7b313 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -8,6 +8,11 @@
     "pid": "0xA455",
     "device_version": "0.0.1"
   },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D0", "pin_b": "D1"}
+    ]
+  },
   "processor": "atmega328p",
   "bootloader": "usbasploader",
   "layout_aliases": {