Fix Softserial (#12679)

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 SOFTSERIAL1_TX_PIN   PB3
-#define UART12_TX_PIN        PB10
+#define SOFTSERIAL2_TX_PIN   PB10
 #define UART1_RX_PIN         PA10
 #define UART2_RX_PIN         PA3
-#define UART11_RX_PIN        PB3
+#define SOFTSERIAL1_RX_PIN   PB3
-#define UART12_RX_PIN        PB10
+#define SOFTSERIAL2_RX_PIN   PB10
 #define I2C1_SCL_PIN         PB8
 #define I2C1_SDA_PIN         PB9
 #define LED0_PIN             PC13

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

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

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

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

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

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

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

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

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

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

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 SOFTSERIAL1_TX_PIN   PB10
-#define UART12_TX_PIN        PB6
+#define SOFTSERIAL2_TX_PIN   PB6
 #define UART1_RX_PIN         PB3
 #define UART2_RX_PIN         PA3
-#define UART11_RX_PIN        PB10
+#define SOFTSERIAL1_RX_PIN   PB10
-#define UART12_RX_PIN        PB6
+#define SOFTSERIAL2_RX_PIN   PB6
 #define I2C1_SCL_PIN         PB8
 #define I2C1_SDA_PIN         PB9
 #define LED0_PIN             PC13

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

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

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

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 SOFTSERIAL1_RX_PIN   PB3
-#define UART11_TX_PIN        PA15
+#define SOFTSERIAL1_TX_PIN   PA15
 #define I2C1_SCL_PIN         PB8
 #define I2C1_SDA_PIN         PB9
 #define LED0_PIN             PC13

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

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 SOFTSERIAL1_RX_PIN   PB10
-#define UART12_RX_PIN        PA0
+#define SOFTSERIAL2_RX_PIN   PA0
 #define I2C1_SCL_PIN         PB8
 #define I2C1_SDA_PIN         PB9
 #define LED0_PIN             PC13

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

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) \

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 SOFTSERIAL1_TX_PIN   PB9
-#define UART12_TX_PIN        PA2
+#define SOFTSERIAL2_TX_PIN   PA2
 #define UART1_RX_PIN         PB3
 #define UART2_RX_PIN         PA3
 #define I2C1_SCL_PIN         PB6

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

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

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 SOFTSERIAL1_TX_PIN   PB0
-#define UART11_RX_PIN        PB0
+#define SOFTSERIAL1_RX_PIN   PB0
 
 #define I2C1_SCL_PIN         PB8
 #define I2C1_SDA_PIN         PB9

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

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

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

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

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

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

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