Remove UNIFIED_SERIAL_PORT_COUNT

betaflight · Jun 20, 2023 · e8f1e4a · e8f1e4a
1 parent 3bc9169
commit e8f1e4a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 29 deletions.
diff --git a/src/main/target/STM32F405/target.h b/src/main/target/STM32F405/target.h
@@ -36,16 +36,14 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
 #define USE_UART4
 #define USE_UART5
 #define USE_UART6
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 6)
+#define SERIAL_PORT_COUNT       9
 
 #define USE_INVERTER
 

diff --git a/src/main/target/STM32F411/target.h b/src/main/target/STM32F411/target.h
@@ -32,13 +32,11 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART6
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 3)
+#define SERIAL_PORT_COUNT       6
 
 #define USE_INVERTER
 

diff --git a/src/main/target/STM32F446/target.h b/src/main/target/STM32F446/target.h
@@ -37,8 +37,7 @@
 #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       5
 
 #define USE_INVERTER
 

diff --git a/src/main/target/STM32F745/target.h b/src/main/target/STM32F745/target.h
@@ -37,8 +37,6 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -48,7 +46,7 @@
 #define USE_UART7
 #define USE_UART8
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 8)
+#define SERIAL_PORT_COUNT       11
 
 #define USE_SPI_DEVICE_1
 #define USE_SPI_DEVICE_2

diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h
@@ -32,16 +32,14 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
 #define USE_UART4
 #define USE_UART5
 #define USE_UART6
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 6)
+#define SERIAL_PORT_COUNT       9
 
 #define USE_SPI_DEVICE_1
 #define USE_SPI_DEVICE_2

diff --git a/src/main/target/STM32G47X/target.h b/src/main/target/STM32G47X/target.h
@@ -33,16 +33,14 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
 #define USE_UART4
 #define USE_UART5
 #define USE_LPUART1
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 6)
+#define SERIAL_PORT_COUNT       9
 
 #define USE_SPI_DEVICE_1
 #define USE_SPI_DEVICE_2

diff --git a/src/main/target/STM32H723/target.h b/src/main/target/STM32H723/target.h
@@ -56,8 +56,6 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -69,7 +67,7 @@
 #define USE_UART9
 #define USE_LPUART1
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 10)
+#define SERIAL_PORT_COUNT       13
 
 #define TARGET_IO_PORTA 0xffff
 #define TARGET_IO_PORTB 0xffff

diff --git a/src/main/target/STM32H730/target.h b/src/main/target/STM32H730/target.h
@@ -68,8 +68,6 @@
 
 #define USE_VCP
 
-#define UNIFIED_SERIAL_PORT_COUNT       1
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -82,7 +80,7 @@
 #define USE_UART10
 #define USE_LPUART1
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 11)
+#define SERIAL_PORT_COUNT       12
 
 // Disable OCTOSPI pins PB2/CLK, PB6/NCS, PD11/IO0, PD12/IO1, PD13/IO3, PE2/IO2
 // PE7/IO4, PE8/IO5, PE9/IO6, PE10/IO7

diff --git a/src/main/target/STM32H743/target.h b/src/main/target/STM32H743/target.h
@@ -33,8 +33,6 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -45,7 +43,7 @@
 #define USE_UART8
 #define USE_LPUART1
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 9)
+#define SERIAL_PORT_COUNT       12
 
 #define USE_SPI_DEVICE_1
 #define USE_SPI_DEVICE_2

diff --git a/src/main/target/STM32H750/target.h b/src/main/target/STM32H750/target.h
@@ -70,8 +70,6 @@
 
 #define USE_SOFTSERIAL
 
-#define UNIFIED_SERIAL_PORT_COUNT       3
-
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
@@ -82,7 +80,7 @@
 #define USE_UART8
 #define USE_LPUART1
 
-#define SERIAL_PORT_COUNT       (UNIFIED_SERIAL_PORT_COUNT + 9)
+#define SERIAL_PORT_COUNT       12
 
 #define TARGET_IO_PORTA 0xffff
 #define TARGET_IO_PORTB 0xffff