From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/rgbkb/mun/config.h | 2 -- keyboards/rgbkb/mun/rev1/info.json | 3 +++ keyboards/rgbkb/sol/config.h | 2 -- keyboards/rgbkb/sol/rev1/info.json | 3 +++ keyboards/rgbkb/sol/rev2/info.json | 3 +++ keyboards/rgbkb/sol3/config.h | 2 -- keyboards/rgbkb/sol3/rev1/info.json | 3 +++ keyboards/rgbkb/zen/rev1/config.h | 2 -- keyboards/rgbkb/zen/rev1/info.json | 3 +++ keyboards/rgbkb/zen/rev2/config.h | 1 - keyboards/rgbkb/zen/rev2/info.json | 3 +++ keyboards/rgbkb/zygomorph/rev1/config.h | 2 -- keyboards/rgbkb/zygomorph/rev1/info.json | 3 +++ 13 files changed, 21 insertions(+), 11 deletions(-) (limited to 'keyboards/rgbkb') diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index fcdfc96681..5fbfc1cbfd 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -39,8 +39,6 @@ /* Split Keyboard Configuration */ #define EE_HANDS #define SPLIT_USB_DETECT -// also handles the SERIAL_USART_TX_PIN define -#define SOFT_SERIAL_PIN A9 #define SERIAL_USART_TX_PAL_MODE 7 #define SERIAL_USART_TIMEOUT 5 #define SERIAL_USART_DRIVER SD1 diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index 3e672b26eb..774fa27a94 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3505", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "A9" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h index 4fa925b6aa..b2e5f2b0d3 100644 --- a/keyboards/rgbkb/sol/config.h +++ b/keyboards/rgbkb/sol/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define TAPPING_TERM 150 -/* Select hand configuration */ -#define SOFT_SERIAL_PIN D3 #define EE_HANDS #define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6} diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index 6b886f1b9c..4182ce4c03 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index 39bfa715bf..264f21d02b 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "split": { + "soft_serial_pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 490f08ae80..a4c7d1e30e 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -46,8 +46,6 @@ /* Split Keyboard Configuration */ #define SPLIT_HAND_PIN C13 #define SPLIT_USB_DETECT -// also handles the SERIAL_USART_TX_PIN define -#define SOFT_SERIAL_PIN A9 #define SERIAL_USART_TX_PAL_MODE 7 #define SERIAL_USART_TIMEOUT 5 #define SERIAL_USART_DRIVER SD1 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index b2dddbd8d8..76eaf07f07 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3510", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "A9" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h index 3e2ec260b6..327fe840c3 100644 --- a/keyboards/rgbkb/zen/rev1/config.h +++ b/keyboards/rgbkb/zen/rev1/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D0 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json index 93a085135f..33b8334958 100644 --- a/keyboards/rgbkb/zen/rev1/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index d744d7878f..9ea7a3dc8f 100644 --- a/keyboards/rgbkb/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h @@ -26,7 +26,6 @@ along with this program. If not, see . #define ENCODERS_PAD_B { D2 } #define RGB_DI_PIN B6 -#define SOFT_SERIAL_PIN D3 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json index f28b9f4d22..d308819a42 100644 --- a/keyboards/rgbkb/zen/rev2/info.json +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x3061", "device_version": "0.0.2" }, + "split": { + "soft_serial_pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h index 07dd021f38..b92bc6d73f 100644 --- a/keyboards/rgbkb/zygomorph/rev1/config.h +++ b/keyboards/rgbkb/zygomorph/rev1/config.h @@ -28,8 +28,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D3 - #define ENCODERS_PAD_A { D2 } #define ENCODERS_PAD_B { D7 } diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index e33354d7f9..e44966dabf 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12", "ortho_5x12"], -- cgit v1.2.3