Platform target evaluation fix (#12904)

betaflight · Jun 21, 2023 · c243e83 · c243e83
1 parent 96c788c
commit c243e83
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 62 deletions.
diff --git a/src/main/target/STM32F405/target.h b/src/main/target/STM32F405/target.h
@@ -32,6 +32,12 @@
 #define USE_I2C_DEVICE_2
 #define USE_I2C_DEVICE_3
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -63,12 +69,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_EARLY
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32F411/target.h b/src/main/target/STM32F411/target.h
@@ -28,6 +28,12 @@
 #define USE_I2C_DEVICE_2
 #define USE_I2C_DEVICE_3
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART6
@@ -62,12 +68,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_EARLY
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32F446/target.h b/src/main/target/STM32F446/target.h
@@ -29,12 +29,17 @@
 #define USE_I2C_DEVICE_2
 #define USE_I2C_DEVICE_3
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 // #define USE_UART6
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-#define SERIAL_PORT_COUNT               (UNIFIED_SERIAL_PORT_COUNT + 3)
+#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 2)
 
 #define USE_INVERTER
 
@@ -62,11 +67,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_EARLY
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL1
-#define USE_SOFTSERIAL2
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32F745/target.h b/src/main/target/STM32F745/target.h
@@ -33,6 +33,12 @@
 #define USE_I2C_DEVICE_3
 #define USE_I2C_DEVICE_4
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -70,12 +76,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_EARLY
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h
@@ -28,6 +28,12 @@
 #define USE_I2C_DEVICE_2
 #define USE_I2C_DEVICE_3
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -62,12 +68,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_EARLY
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32G47X/target.h b/src/main/target/STM32G47X/target.h
@@ -29,6 +29,12 @@
 #define USE_I2C_DEVICE_3
 #define USE_I2C_DEVICE_4
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -61,12 +67,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_LATE
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32H723/target.h b/src/main/target/STM32H723/target.h
@@ -52,6 +52,12 @@
 
 #define USE_SPI_DMA_ENABLE_LATE
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -80,13 +86,6 @@
 #define USE_SDCARD_SDIO
 #endif
 
-
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32H730/target.h b/src/main/target/STM32H730/target.h
@@ -66,6 +66,10 @@
 
 #define USE_SPI_DMA_ENABLE_LATE
 
+#define USE_VCP
+
+#define UNIFIED_SERIAL_PORT_COUNT       1
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -94,10 +98,6 @@
 
 #define USE_BEEPER
 
-#define USE_VCP
-
-#define UNIFIED_SERIAL_PORT_COUNT       1
-
 #define USE_USB_ID
 #define USE_USB_DETECT
 

diff --git a/src/main/target/STM32H743/target.h b/src/main/target/STM32H743/target.h
@@ -29,6 +29,12 @@
 #define USE_I2C_DEVICE_3
 #define USE_I2C_DEVICE_4
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -70,12 +76,6 @@
 #define SPI_FULL_RECONFIGURABILITY
 #define USE_SPI_DMA_ENABLE_LATE
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/main/target/STM32H750/target.h b/src/main/target/STM32H750/target.h
@@ -66,6 +66,12 @@
 
 #define USE_SPI_DMA_ENABLE_LATE
 
+#define USE_VCP
+
+#define USE_SOFTSERIAL
+
+#define UNIFIED_SERIAL_PORT_COUNT       3
+
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -87,12 +93,6 @@
 
 #define USE_BEEPER
 
-#define USE_VCP
-
-#define USE_SOFTSERIAL
-
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_USB_DETECT
 
 #define USE_ESCSERIAL

diff --git a/src/test/unit/target.h b/src/test/unit/target.h
@@ -62,8 +62,7 @@
 #define USE_UART3
 #define USE_UART4
 #define USE_UART5
-#define USE_SOFTSERIAL1
-#define USE_SOFTSERIAL2
+#define USE_SOFTSERIAL
 
 #define SERIAL_PORT_COUNT 8