7 files changed, 18 insertions, 39 deletions
diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h
index f20b77b231..9f1a9ae244 100644
--- a/keyboards/handwired/sono1/config.h
+++ b/keyboards/handwired/sono1/config.h
@@ -17,22 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 15
-#define MATRIX_COLS 8
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 /* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h
index 33563c3cf7..b961eaffd6 100644
--- a/keyboards/handwired/sono1/stm32f103/config.h
+++ b/keyboards/handwired/sono1/stm32f103/config.h
@@ -17,16 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 #define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
 #define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
 
-
-#define LED_KANA_PIN A2
-#define LED_CAPS_LOCK_PIN B5
 #define LED_CTRL_XFER_PIN B6
-#define LED_NUM_LOCK_PIN B4
 #define LED_KB_LOCK_PIN B12
-#define LED_PIN_ON_STATE 0
-
diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json
index 90ac25f360..b25392382a 100644
--- a/keyboards/handwired/sono1/stm32f103/info.json
+++ b/keyboards/handwired/sono1/stm32f103/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "indicators": {
+        "caps_lock": "B5",
+        "num_lock": "B4",
+        "kana": "A2",
+        "on_state": 0
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino"
 }
diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk
index 019b1130d9..a92b099328 100644
--- a/keyboards/handwired/sono1/stm32f103/rules.mk
+++ b/keyboards/handwired/sono1/stm32f103/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h
index 3ecf674050..15bea036a2 100644
--- a/keyboards/handwired/sono1/t2pp/config.h
+++ b/keyboards/handwired/sono1/t2pp/config.h
@@ -17,16 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
 
 #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 }
 
-
-#define LED_KANA_PIN D5
-#define LED_CAPS_LOCK_PIN B3
 #define LED_CTRL_XFER_PIN B4
-#define LED_NUM_LOCK_PIN B2
 #define LED_KB_LOCK_PIN B1
-#define LED_PIN_ON_STATE 0
-
diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json
index e557e4d307..3e637c3e94 100644
--- a/keyboards/handwired/sono1/t2pp/info.json
+++ b/keyboards/handwired/sono1/t2pp/info.json
@@ -1,5 +1,13 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "num_lock": "B2",
+        "kana": "D5",
+        "on_state": 0
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/sono1/t2pp/rules.mk b/keyboards/handwired/sono1/t2pp/rules.mk
index 149471682d..e69de29bb2 100644
--- a/keyboards/handwired/sono1/t2pp/rules.mk
+++ b/keyboards/handwired/sono1/t2pp/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-BOOTLOADER = halfkay