Merge remote-tracking branch 'upstream/develop'

3 files changed, 17 insertions, 31 deletions

diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 4e9ce710a4..1c175166ee 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -16,29 +16,15 @@
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 19
-
 #define MATRIX_COL_PINS \
     { B10, B11, B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B7, B8, B9, C14, C15, F0, A3 }
 #define MATRIX_ROW_PINS \
     { B5, B6, A7, B0, B1, B2, A4 }
 #define DIODE_DIRECTION COL2ROW
 
-#define BACKLIGHT_PIN A6
 #define BACKLIGHT_PWM_DRIVER PWMD3
 #define BACKLIGHT_PWM_CHANNEL 1
 #define BACKLIGHT_PAL_MODE 1
-#define BACKLIGHT_LEVELS 6
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 6
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
@@ -63,19 +49,8 @@
 //The 3D-printed version of Boston uses APA106 LEDs, which are reversed
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 
-/* Define encoder */
-#define ENCODERS_PAD_A \
-    { C13 }
-#define ENCODERS_PAD_B \
-    { F1 }
-#define ENCODER_RESOLUTION 2
 #define TAP_CODE_DELAY 15
 
-/* Lock LEDs */
-#define LED_NUM_LOCK_PIN A0
-#define LED_CAPS_LOCK_PIN A1
-#define LED_SCROLL_LOCK_PIN A2
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index f0d832afbf..1d8e39f29d 100644
--- a/keyboards/boston/info.json
+++ b/keyboards/boston/info.json
@@ -8,6 +8,23 @@
         "pid": "0x4176",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C13", "pin_b": "F1", "resolution": 2}
+        ]
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 6,
+        "breathing": true
+    },
+    "indicators": {
+        "caps_lock": "A1",
+        "num_lock": "A0",
+        "scroll_lock": "A2"
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk
index 5a00322c46..8d99a6cd0b 100644
--- a/keyboards/boston/rules.mk
+++ b/keyboards/boston/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #