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/handwired/dactyl_manuform/3x5_3/info.json | 3 +++ keyboards/handwired/dactyl_manuform/4x5/info.json | 3 +++ keyboards/handwired/dactyl_manuform/4x5_5/info.json | 3 +++ keyboards/handwired/dactyl_manuform/4x6/info.json | 3 +++ keyboards/handwired/dactyl_manuform/4x6_5/info.json | 3 +++ keyboards/handwired/dactyl_manuform/5x6/info.json | 3 +++ keyboards/handwired/dactyl_manuform/5x6_2_5/info.json | 1 + keyboards/handwired/dactyl_manuform/5x6_5/info.json | 1 + keyboards/handwired/dactyl_manuform/5x6_6/config.h | 4 ---- keyboards/handwired/dactyl_manuform/5x6_6/info.json | 3 +++ keyboards/handwired/dactyl_manuform/5x6_68/info.json | 3 +++ keyboards/handwired/dactyl_manuform/5x7/info.json | 3 +++ keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h | 6 +----- keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json | 1 + keyboards/handwired/dactyl_manuform/6x6/promicro/info.json | 3 +++ keyboards/handwired/dactyl_manuform/6x6_4/info.json | 3 +++ keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json | 3 +++ keyboards/handwired/dactyl_manuform/6x7/info.json | 3 +++ keyboards/handwired/dactyl_manuform/config.h | 3 --- keyboards/handwired/dactyl_manuform/dmote/62key/info.json | 3 +++ 20 files changed, 46 insertions(+), 12 deletions(-) (limited to 'keyboards/handwired/dactyl_manuform') diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index 3427f83527..7302ced47e 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -8,6 +8,9 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["split_3x5_3"], diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json index 98df75cfdf..00e052ce3a 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/info.json @@ -8,6 +8,9 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json index 5b5b3747bb..b762c15cf8 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json @@ -8,6 +8,9 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index b8c2136d7b..5d6bb593ca 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -8,6 +8,9 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index fb7a77309d..e650d4990c 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -8,6 +8,9 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index d0515e0228..28cd7324ba 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json @@ -8,6 +8,9 @@ "pid": "0x3536", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json index 12b8c20c5a..f6643ce8c8 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.3" }, "split": { + "soft_serial_pin": "D0", "bootmagic": { "matrix": [6, 5] } diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json index b8fda10021..e422a73131 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.2" }, "split": { + "soft_serial_pin": "D0", "bootmagic": { "matrix": [6, 5] } diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h index 0f8e9740ce..2b99868d19 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_6/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once - -#undef SOFT_SERIAL_PIN -#define SOFT_SERIAL_PIN D3 - // wiring of each half #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index 3000185d7e..c81ac40fdb 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json @@ -8,6 +8,9 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "split": { + "soft_serial_pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json index efa9a11aef..db29e436b6 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json @@ -10,6 +10,9 @@ "pid": "0x0016", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index 292bbcd12f..4eed5d53b4 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json @@ -8,6 +8,9 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h index 717e0e98f0..0f40ee28ac 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h @@ -16,9 +16,6 @@ #pragma once - -#undef SOFT_SERIAL_PIN - #define MATRIX_ROW_PINS { B12, B13, B14, B15, A8 , A9, A10} #define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4} /* COL2ROW, ROW2COL */ @@ -31,9 +28,8 @@ /* connection */ #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. -#define SOFT_SERIAL_PIN B6 // USART TX pin #define SERIAL_USART_RX_PIN B7 // USART RX pin -#define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN // USART TX pin +#define SERIAL_USART_TX_PIN B6 // USART TX pin #define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5 // 0: 460800 baud diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json index f28579ba5f..bacc955479 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -1,5 +1,6 @@ { "split": { + "soft_serial_pin": "B6", "bootmagic": { "matrix": [7, 0] } diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json index 4369a04103..52523980a9 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json @@ -1,4 +1,7 @@ { + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json index aa9b1ae3d5..4e9b444163 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json @@ -8,6 +8,9 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json index 76d5d2c5c4..6c929eb18c 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json @@ -8,6 +8,9 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index c52089f654..b2ea65651e 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -8,6 +8,9 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/dactyl_manuform/config.h b/keyboards/handwired/dactyl_manuform/config.h index c87b6ca3e5..904e5a729d 100644 --- a/keyboards/handwired/dactyl_manuform/config.h +++ b/keyboards/handwired/dactyl_manuform/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* serial.c configuration for split keyboard */ -#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/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json index 7f15634131..8d2648f11e 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json @@ -10,6 +10,9 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "D0" + }, "layouts": { "LAYOUT_62key": { "layout": [ -- cgit v1.2.3