From 1fa44099e14935508a27790204f7030c7fae6d3b Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Wed, 19 Apr 2023 16:44:29 +0200 Subject: [PATCH] Fix Softserial (#12679) --- src/config/BETAFPVF411/config.h | 8 ++++---- src/config/BETAFPVF4SX1280/config.h | 8 ++++++-- src/config/BLUEJAYF4/config.h | 2 +- src/config/DAKEFPVF411/config.h | 4 ++-- src/config/DARWINF411/config.h | 4 ++-- src/config/DARWINF4SX1280HD/config.h | 4 ++-- src/config/EACHINEF411_AIO/config.h | 2 +- src/config/ELINF405/config.h | 4 ++-- src/config/ELINF722/config.h | 4 ++-- src/config/FLYWOOF411HEX/config.h | 4 ++-- src/config/FLYWOOF411V2/config.h | 4 ++-- src/config/GEMEF411/config.h | 8 ++++---- src/config/GEPRCF405/config.h | 4 ++-- src/config/GEPRCF411_AIO/config.h | 4 ++-- src/config/GEP_F405_VTX_V3/config.h | 4 ++-- src/config/HAKRCF411D/config.h | 4 ++-- src/config/IFLIGHT_F405_TWING/config.h | 4 ++-- src/config/IFLIGHT_F411_AIO32/config.h | 6 +++--- src/config/LDARC_F411/config.h | 4 ++-- src/config/MAMBAG4/config.h | 2 +- src/config/MATEKF411SE/config.h | 4 ++-- src/config/NEUTRONRCF411AIO/config.h | 4 ++-- src/config/SIRMIXALOT/config.h | 4 ++-- src/config/SKYSTARSF411/config.h | 4 ++-- src/config/SPEEDYBEEF7/config.h | 2 +- src/config/VGOODRCF4/config.h | 4 ++-- src/config/VRRACE/config.h | 4 ++-- src/config/YUPIF4/config.h | 4 ++-- src/config/YUPIF7/config.h | 4 ++-- src/config/ZEUSF4EVO/config.h | 4 ++-- src/main/config/config.c | 3 +++ 31 files changed, 68 insertions(+), 61 deletions(-) diff --git a/src/config/BETAFPVF411/config.h b/src/config/BETAFPVF411/config.h index b21aa35f1b..73606cc824 100644 --- a/src/config/BETAFPVF411/config.h +++ b/src/config/BETAFPVF411/config.h @@ -44,12 +44,12 @@ #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB3 -#define UART12_TX_PIN PB10 +#define SOFTSERIAL1_TX_PIN PB3 +#define SOFTSERIAL2_TX_PIN PB10 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB3 -#define UART12_RX_PIN PB10 +#define SOFTSERIAL1_RX_PIN PB3 +#define SOFTSERIAL2_RX_PIN PB10 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/BETAFPVF4SX1280/config.h b/src/config/BETAFPVF4SX1280/config.h index e7e0f396c8..ad6f39f18a 100644 --- a/src/config/BETAFPVF4SX1280/config.h +++ b/src/config/BETAFPVF4SX1280/config.h @@ -33,6 +33,8 @@ #define USE_ACC_SPI_MPU6000 #define USE_GYRO_SPI_MPU6000 #define USE_ACCGYRO_BMI270 +#define USE_FLASH +#define USE_FLASH_W25Q128FV #define USE_MAX7456 #define USE_RX_SPI #define USE_RX_EXPRESSLRS @@ -60,10 +62,10 @@ #define LED_STRIP_PIN PB1 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PA8 +#define SOFTSERIAL1_TX_PIN PA8 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PA8 +#define SOFTSERIAL1_RX_PIN PA8 #define LED0_PIN PC14 #define SPI1_SCK_PIN PA5 #define SPI2_SCK_PIN PB13 @@ -85,6 +87,7 @@ #define RX_SPI_EXPRESSLRS_BUSY_PIN PA13 #define GYRO_1_EXTI_PIN PB6 #define GYRO_1_CS_PIN PA4 +#define FLASH_CS_PIN PA10 #define TIMER_PIN_MAPPING \ TIMER_PIN_MAP( 0, PB1 , 2, 0) \ @@ -108,6 +111,7 @@ #define DEFAULT_CURRENT_METER_SCALE 800 #define BEEPER_INVERTED #define SYSTEM_HSE_MHZ 8 +#define FLASH_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2 #define USE_SPI_GYRO #define GYRO_1_SPI_INSTANCE SPI1 diff --git a/src/config/BLUEJAYF4/config.h b/src/config/BLUEJAYF4/config.h index 26571a9cbc..54b6205b84 100644 --- a/src/config/BLUEJAYF4/config.h +++ b/src/config/BLUEJAYF4/config.h @@ -45,7 +45,7 @@ #define UART1_TX_PIN PA9 #define UART3_TX_PIN PB10 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PB3 #define UART1_RX_PIN PA10 #define UART3_RX_PIN PB11 #define UART6_RX_PIN PC7 diff --git a/src/config/DAKEFPVF411/config.h b/src/config/DAKEFPVF411/config.h index d1f4aec913..2583174d5a 100644 --- a/src/config/DAKEFPVF411/config.h +++ b/src/config/DAKEFPVF411/config.h @@ -44,10 +44,10 @@ #define LED_STRIP_PIN PA1 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB10 +#define SOFTSERIAL1_TX_PIN PB10 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB10 +#define SOFTSERIAL1_RX_PIN PB10 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/DARWINF411/config.h b/src/config/DARWINF411/config.h index dce40e9772..e023f40865 100644 --- a/src/config/DARWINF411/config.h +++ b/src/config/DARWINF411/config.h @@ -48,10 +48,10 @@ #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PB3 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB3 +#define SOFTSERIAL1_RX_PIN PB3 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/DARWINF4SX1280HD/config.h b/src/config/DARWINF4SX1280HD/config.h index 3fef35932d..9be911d3b3 100644 --- a/src/config/DARWINF4SX1280HD/config.h +++ b/src/config/DARWINF4SX1280HD/config.h @@ -67,10 +67,10 @@ #define LED_STRIP_PIN PB1 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PA8 +#define SOFTSERIAL1_TX_PIN PA8 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PA8 +#define SOFTSERIAL1_RX_PIN PA8 #define LED0_PIN PC14 #define SPI1_SCK_PIN PA5 #define SPI2_SCK_PIN PB13 diff --git a/src/config/EACHINEF411_AIO/config.h b/src/config/EACHINEF411_AIO/config.h index 6fdd9c7715..8423629c42 100644 --- a/src/config/EACHINEF411_AIO/config.h +++ b/src/config/EACHINEF411_AIO/config.h @@ -43,7 +43,7 @@ #define UART2_TX_PIN PA2 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_TX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PB3 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/ELINF405/config.h b/src/config/ELINF405/config.h index a4dbc1d966..a1dce4177d 100644 --- a/src/config/ELINF405/config.h +++ b/src/config/ELINF405/config.h @@ -45,12 +45,12 @@ #define UART3_TX_PIN PB10 #define UART4_TX_PIN PA0 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PC9 +#define SOFTSERIAL1_TX_PIN PC9 #define UART1_RX_PIN PA10 #define UART3_RX_PIN PB11 #define UART4_RX_PIN PA1 #define UART6_RX_PIN PC7 -#define UART12_RX_PIN PA8 +#define SOFTSERIAL2_RX_PIN PA8 #define INVERTER_PIN_UART1 PC0 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 diff --git a/src/config/ELINF722/config.h b/src/config/ELINF722/config.h index af030199fe..d722678eb7 100644 --- a/src/config/ELINF722/config.h +++ b/src/config/ELINF722/config.h @@ -43,12 +43,12 @@ #define UART3_TX_PIN PB10 #define UART4_TX_PIN PA0 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PC9 +#define SOFTSERIAL1_TX_PIN PC9 #define UART1_RX_PIN PA10 #define UART3_RX_PIN PB11 #define UART4_RX_PIN PA1 #define UART6_RX_PIN PC7 -#define UART12_RX_PIN PA8 +#define SOFTSERIAL2_RX_PIN PA8 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PB5 diff --git a/src/config/FLYWOOF411HEX/config.h b/src/config/FLYWOOF411HEX/config.h index 90f76196ec..808b4d4072 100644 --- a/src/config/FLYWOOF411HEX/config.h +++ b/src/config/FLYWOOF411HEX/config.h @@ -43,10 +43,10 @@ #define LED_STRIP_PIN PA0 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB4 +#define SOFTSERIAL1_TX_PIN PB4 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB0 +#define SOFTSERIAL1_RX_PIN PB0 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/FLYWOOF411V2/config.h b/src/config/FLYWOOF411V2/config.h index 66b4e630fd..0787ac0237 100644 --- a/src/config/FLYWOOF411V2/config.h +++ b/src/config/FLYWOOF411V2/config.h @@ -45,10 +45,10 @@ #define LED_STRIP_PIN PA0 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB6 +#define SOFTSERIAL1_TX_PIN PB6 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB7 +#define SOFTSERIAL1_RX_PIN PB7 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/GEMEF411/config.h b/src/config/GEMEF411/config.h index b5d47923d0..09a3f7d38c 100644 --- a/src/config/GEMEF411/config.h +++ b/src/config/GEMEF411/config.h @@ -46,12 +46,12 @@ #define LED_STRIP_PIN PA0 #define UART1_TX_PIN PA15 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB10 -#define UART12_TX_PIN PB6 +#define SOFTSERIAL1_TX_PIN PB10 +#define SOFTSERIAL2_TX_PIN PB6 #define UART1_RX_PIN PB3 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB10 -#define UART12_RX_PIN PB6 +#define SOFTSERIAL1_RX_PIN PB10 +#define SOFTSERIAL2_RX_PIN PB6 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/GEPRCF405/config.h b/src/config/GEPRCF405/config.h index 63cafef17e..57c712f0c3 100644 --- a/src/config/GEPRCF405/config.h +++ b/src/config/GEPRCF405/config.h @@ -52,14 +52,14 @@ #define UART4_TX_PIN PA0 #define UART5_TX_PIN PC12 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB2 +#define SOFTSERIAL1_TX_PIN PB2 #define UART1_RX_PIN PB7 #define UART2_RX_PIN PA3 #define UART3_RX_PIN PC11 #define UART4_RX_PIN PA1 #define UART5_RX_PIN PD2 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PC5 +#define SOFTSERIAL1_RX_PIN PC5 #define I2C1_SCL_PIN PB8 #define I2C2_SCL_PIN PB10 #define I2C1_SDA_PIN PB9 diff --git a/src/config/GEPRCF411_AIO/config.h b/src/config/GEPRCF411_AIO/config.h index f273c285f9..4cd23d3a3b 100644 --- a/src/config/GEPRCF411_AIO/config.h +++ b/src/config/GEPRCF411_AIO/config.h @@ -47,10 +47,10 @@ #define RX_PPM_PIN PA3 #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 -#define UART11_TX_PIN PA0 +#define SOFTSERIAL1_TX_PIN PA0 #define UART2_TX_PIN PA2 #define UART1_RX_PIN PA10 -#define UART11_RX_PIN PB10 +#define SOFTSERIAL1_RX_PIN PB10 #define UART2_RX_PIN PA3 #define LED0_PIN PC13 #define LED1_PIN PC14 diff --git a/src/config/GEP_F405_VTX_V3/config.h b/src/config/GEP_F405_VTX_V3/config.h index de77da2738..74fd3361ed 100644 --- a/src/config/GEP_F405_VTX_V3/config.h +++ b/src/config/GEP_F405_VTX_V3/config.h @@ -37,12 +37,12 @@ #define UART3_TX_PIN PB10 #define UART4_TX_PIN PA0 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB8 +#define SOFTSERIAL1_TX_PIN PB8 #define UART1_RX_PIN PA10 #define UART3_RX_PIN PB11 #define UART4_RX_PIN PA1 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PB7 +#define SOFTSERIAL1_RX_PIN PB7 #define I2C2_SCL_PIN PB10 #define I2C2_SDA_PIN PB11 #define LED0_PIN PB5 diff --git a/src/config/HAKRCF411D/config.h b/src/config/HAKRCF411D/config.h index 8858e151c9..d3a2aab1f3 100644 --- a/src/config/HAKRCF411D/config.h +++ b/src/config/HAKRCF411D/config.h @@ -49,8 +49,8 @@ #define UART1_RX_PIN PA10 #define UART2_TX_PIN PA2 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB3 -#define UART11_TX_PIN PA15 +#define SOFTSERIAL1_RX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PA15 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/IFLIGHT_F405_TWING/config.h b/src/config/IFLIGHT_F405_TWING/config.h index fb7f5e7ec0..b21382eb49 100644 --- a/src/config/IFLIGHT_F405_TWING/config.h +++ b/src/config/IFLIGHT_F405_TWING/config.h @@ -48,12 +48,12 @@ #define UART2_TX_PIN PA2 #define UART3_TX_PIN PB10 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB9 +#define SOFTSERIAL1_TX_PIN PB9 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 #define UART3_RX_PIN PB11 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PB8 +#define SOFTSERIAL1_RX_PIN PB8 #define INVERTER_PIN_UART2 PC13 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 diff --git a/src/config/IFLIGHT_F411_AIO32/config.h b/src/config/IFLIGHT_F411_AIO32/config.h index 741983f6ed..7056dbde4b 100644 --- a/src/config/IFLIGHT_F411_AIO32/config.h +++ b/src/config/IFLIGHT_F411_AIO32/config.h @@ -44,11 +44,11 @@ #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PB3 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB10 -#define UART12_RX_PIN PA0 +#define SOFTSERIAL1_RX_PIN PB10 +#define SOFTSERIAL2_RX_PIN PA0 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/LDARC_F411/config.h b/src/config/LDARC_F411/config.h index e75890d75b..436f8d607a 100644 --- a/src/config/LDARC_F411/config.h +++ b/src/config/LDARC_F411/config.h @@ -35,10 +35,10 @@ #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PB3 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB10 +#define SOFTSERIAL1_RX_PIN PB10 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/MAMBAG4/config.h b/src/config/MAMBAG4/config.h index 7633902568..c16313a965 100644 --- a/src/config/MAMBAG4/config.h +++ b/src/config/MAMBAG4/config.h @@ -68,7 +68,7 @@ #define UART3_TX_PIN PB10 #define UART4_RX_PIN PC11 #define UART4_TX_PIN PC10 -#define UART11_TX_PIN PB9 +#define SOFTSERIAL1_TX_PIN PB9 #define TIMER_PIN_MAPPING \ TIMER_PIN_MAP( 0, MOTOR1_PIN, 1, 1) \ diff --git a/src/config/MATEKF411SE/config.h b/src/config/MATEKF411SE/config.h index cff08bb78d..bba6e29e85 100644 --- a/src/config/MATEKF411SE/config.h +++ b/src/config/MATEKF411SE/config.h @@ -44,8 +44,8 @@ #define LED_STRIP_PIN PB10 #define UART1_TX_PIN PA15 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB9 -#define UART12_TX_PIN PA2 +#define SOFTSERIAL1_TX_PIN PB9 +#define SOFTSERIAL2_TX_PIN PA2 #define UART1_RX_PIN PB3 #define UART2_RX_PIN PA3 #define I2C1_SCL_PIN PB6 diff --git a/src/config/NEUTRONRCF411AIO/config.h b/src/config/NEUTRONRCF411AIO/config.h index 9c40703486..61957c8f6b 100644 --- a/src/config/NEUTRONRCF411AIO/config.h +++ b/src/config/NEUTRONRCF411AIO/config.h @@ -49,10 +49,10 @@ #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PA0 +#define SOFTSERIAL1_TX_PIN PA0 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB10 +#define SOFTSERIAL1_RX_PIN PB10 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/config/SIRMIXALOT/config.h b/src/config/SIRMIXALOT/config.h index 6c4c09c5be..ea06971b7a 100644 --- a/src/config/SIRMIXALOT/config.h +++ b/src/config/SIRMIXALOT/config.h @@ -37,13 +37,13 @@ #define UART3_TX_PIN PB10 #define UART5_TX_PIN PC12 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PA0 +#define SOFTSERIAL1_TX_PIN PA0 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 #define UART4_RX_PIN PA1 #define UART5_RX_PIN PD2 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PB11 +#define SOFTSERIAL1_RX_PIN PB11 #define I2C1_SCL_PIN PA8 #define I2C1_SDA_PIN PC9 #define LED0_PIN PB12 diff --git a/src/config/SKYSTARSF411/config.h b/src/config/SKYSTARSF411/config.h index 4ef233008e..0ba615a430 100644 --- a/src/config/SKYSTARSF411/config.h +++ b/src/config/SKYSTARSF411/config.h @@ -53,8 +53,8 @@ #define UART2_TX_PIN PA2 #define UART2_RX_PIN PA3 -#define UART11_TX_PIN PB0 -#define UART11_RX_PIN PB0 +#define SOFTSERIAL1_TX_PIN PB0 +#define SOFTSERIAL1_RX_PIN PB0 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 diff --git a/src/config/SPEEDYBEEF7/config.h b/src/config/SPEEDYBEEF7/config.h index e35f347f67..b566790e80 100644 --- a/src/config/SPEEDYBEEF7/config.h +++ b/src/config/SPEEDYBEEF7/config.h @@ -52,7 +52,7 @@ #define UART3_TX_PIN PC10 #define UART4_TX_PIN PA0 #define UART5_TX_PIN PC12 -#define UART11_TX_PIN PB0 +#define SOFTSERIAL1_TX_PIN PB0 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 #define UART3_RX_PIN PC11 diff --git a/src/config/VGOODRCF4/config.h b/src/config/VGOODRCF4/config.h index 6e428de937..7b3a507bf5 100644 --- a/src/config/VGOODRCF4/config.h +++ b/src/config/VGOODRCF4/config.h @@ -48,14 +48,14 @@ #define UART4_TX_PIN PA0 #define UART5_TX_PIN PC12 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB2 +#define SOFTSERIAL1_TX_PIN PB2 #define UART1_RX_PIN PB7 #define UART2_RX_PIN PA3 #define UART3_RX_PIN PC11 #define UART4_RX_PIN PA1 #define UART5_RX_PIN PD2 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PC5 +#define SOFTSERIAL1_RX_PIN PC5 #define I2C1_SCL_PIN PB8 #define I2C2_SCL_PIN PB10 #define I2C1_SDA_PIN PB9 diff --git a/src/config/VRRACE/config.h b/src/config/VRRACE/config.h index 3ea7cf4340..871f8d674d 100644 --- a/src/config/VRRACE/config.h +++ b/src/config/VRRACE/config.h @@ -50,12 +50,12 @@ #define UART2_TX_PIN PD5 #define UART3_TX_PIN PD8 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PE11 +#define SOFTSERIAL1_TX_PIN PE11 #define UART1_RX_PIN PB7 #define UART2_RX_PIN PD6 #define UART3_RX_PIN PD9 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PE13 +#define SOFTSERIAL1_RX_PIN PE13 #define INVERTER_PIN_UART6 PD7 #define LED0_PIN PD14 #define LED1_PIN PD15 diff --git a/src/config/YUPIF4/config.h b/src/config/YUPIF4/config.h index 51f25fae9c..4d1723d550 100644 --- a/src/config/YUPIF4/config.h +++ b/src/config/YUPIF4/config.h @@ -48,11 +48,11 @@ #define UART1_TX_PIN PA9 #define UART3_TX_PIN PB10 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB0 +#define SOFTSERIAL1_TX_PIN PB0 #define UART1_RX_PIN PA10 #define UART3_RX_PIN PB11 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PB1 +#define SOFTSERIAL1_RX_PIN PB1 #define INVERTER_PIN_UART1 PB12 #define INVERTER_PIN_UART6 PB15 #define LED0_PIN PB6 diff --git a/src/config/YUPIF7/config.h b/src/config/YUPIF7/config.h index 2898dafa1d..6c0680418f 100644 --- a/src/config/YUPIF7/config.h +++ b/src/config/YUPIF7/config.h @@ -47,12 +47,12 @@ #define UART3_TX_PIN PB10 #define UART5_TX_PIN PC12 #define UART6_TX_PIN PC6 -#define UART11_TX_PIN PB1 +#define SOFTSERIAL1_TX_PIN PB1 #define UART1_RX_PIN PA10 #define UART3_RX_PIN PB11 #define UART5_RX_PIN PD2 #define UART6_RX_PIN PC7 -#define UART11_RX_PIN PB0 +#define SOFTSERIAL1_RX_PIN PB0 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PB4 diff --git a/src/config/ZEUSF4EVO/config.h b/src/config/ZEUSF4EVO/config.h index 7a5145f4b0..97fb7a269a 100644 --- a/src/config/ZEUSF4EVO/config.h +++ b/src/config/ZEUSF4EVO/config.h @@ -45,10 +45,10 @@ #define LED_STRIP_PIN PA8 #define UART1_TX_PIN PA9 #define UART2_TX_PIN PA2 -#define UART11_TX_PIN PB3 +#define SOFTSERIAL1_TX_PIN PB3 #define UART1_RX_PIN PA10 #define UART2_RX_PIN PA3 -#define UART11_RX_PIN PB10 +#define SOFTSERIAL1_RX_PIN PB10 #define I2C1_SCL_PIN PB8 #define I2C1_SDA_PIN PB9 #define LED0_PIN PC13 diff --git a/src/main/config/config.c b/src/main/config/config.c index 458dfae362..959416697f 100644 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -499,6 +499,9 @@ if (systemConfig()->configurationState == CONFIGURATION_STATE_DEFAULTS_BARE) { featureEnableImmediate(FEATURE_CHANNEL_FORWARDING); featureEnableImmediate(FEATURE_SERVO_TILT); #endif +#if defined(SOFTSERIAL1_RX_PIN) || defined(SOFTSERIAL2_RX_PIN) || defined(SOFTSERIAL1_TX_PIN) || defined(SOFTSERIAL2_TX_PIN) + featureEnableImmediate(FEATURE_SOFTSERIAL); +#endif #ifdef USE_TELEMETRY featureEnableImmediate(FEATURE_TELEMETRY); #endif