AP_HAL_ChibiOS: enable MSP VTX control on DisplayPort and DJI boards

These boards default a serial port to MSP DisplayPort or DJI FPV, so they
have the digital VTX hardware that MSP VTX control targets. Enable it
explicitly now that it no longer defaults on for >1MB boards.
This commit is contained in:
Andy Piper
2026-07-29 17:16:29 +10:00
committed by Andrew Tridgell
parent 7bc19ba04c
commit fcd4db28c7
36 changed files with 36 additions and 0 deletions
@@ -63,6 +63,7 @@ define DEFAULT_SERIAL5_BAUD 115
PE0 UART8_RX UART8
PE1 UART8_TX UART8
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# Settings for OSD
define OSD_ENABLED 1
define HAL_OSD_TYPE_DEFAULT 5 # MSP Displayport
@@ -74,6 +74,7 @@ define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_RCIN
PD8 USART3_TX USART3
PD9 USART3_RX USART3
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART4
PB8 UART4_RX UART4
@@ -36,6 +36,7 @@ PE10 UART7_CTS UART7
PC12 UART5_TX UART5
PD2 UART5_RX UART5
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# GPS
PB6 USART1_TX USART1
@@ -118,6 +118,7 @@ define DEFAULT_SERIAL1_BAUD 115
PA2 USART2_TX USART2
PA3 USART2_RX USART2
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# USART3: ESC telemetry (receive only)
PD9 USART3_RX USART3 NODMA
@@ -129,6 +129,7 @@ define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_GPS
PD8 USART3_TX USART3
PD9 USART3_RX USART3
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_DJI_FPV
define AP_MSP_VIDEOTX_ENABLED 1
# UART4 (Telemetry), SERIAL4
PB8 UART4_RX UART4
@@ -111,6 +111,7 @@ PB8 UART4_RX UART4 NODMA
PC7 USART6_RX USART6
PC6 USART6_TX USART6
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART7 (GPS)
PE7 UART7_RX UART7
@@ -55,6 +55,7 @@ PA12 OTG_FS_DP OTG1
PA10 USART1_RX USART1
PA9 USART1_TX USART1
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# USART2 - RX
PD5 USART2_TX USART2
@@ -62,6 +62,7 @@ PE0 UART8_RX UART8
#Serial Port defaults
define DEFAULT_SERIAL5_PROTOCOL SerialProtocol_RCIN
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_ESCTelemetry
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MAVLink2
@@ -85,6 +85,7 @@ define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_ESCTelemetry
PB8 UART4_RX UART4
PB9 UART4_TX UART4
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART5 (RX)
PB5 UART5_RX UART5
@@ -88,6 +88,7 @@ define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_ESCTelemetry
PB8 UART4_RX UART4
PB9 UART4_TX UART4
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART5 (RX)
PB5 UART5_RX UART5
@@ -93,6 +93,7 @@ PE8 UART7_TX UART7 NODMA
PE0 UART8_RX UART8
PE1 UART8_TX UART8
define DEFAULT_SERIAL8_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# I2C ports
I2C_ORDER I2C1 I2C2
@@ -90,6 +90,7 @@ define DEFAULT_SERIAL6_BAUD 115
PE7 UART7_RX UART7
PE8 UART7_TX UART7
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_DJI_FPV
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL7_BAUD 115
# UART8 (ESC)
@@ -83,6 +83,7 @@ define AP_NOTIFY_GPIO_LED_1_PIN 90
PA10 USART1_RX USART1
PA9 USART1_TX USART1
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# USART2
# RC input defaults to UART to allow for bi-dir dshot
@@ -203,6 +203,7 @@ PD10 USER_GPIO3 OUTPUT LOW GPIO(82)
# Serial functions
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_RCIN
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_None
define DEFAULT_SERIAL8_PROTOCOL SerialProtocol_ESCTelemetry
@@ -56,6 +56,7 @@ PA12 OTG_FS_DP OTG1
PA10 USART1_RX USART1
PA9 USART1_TX USART1
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define OSD_ENABLED 1
define HAL_OSD_TYPE_DEFAULT 5
@@ -89,6 +89,7 @@ PD2 UART5_RX UART5 NODMA
PC6 USART6_TX USART6
PC7 USART6_RX USART6
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART7
PE7 UART7_RX UART7 NODMA
@@ -60,6 +60,7 @@ PE0 UART8_RX UART8 NODMA
# Serial Protocols
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MAVLink2
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_GPS
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MAVLink2
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_RCIN
@@ -86,6 +86,7 @@ PD8 USART3_TX USART3
PD0 UART4_RX UART4 NODMA
PD1 UART4_TX UART4 NODMA
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART5 for telem2
PD2 UART5_RX UART5
@@ -142,6 +142,7 @@ define HAL_OS_FATFS_IO 1
# setup for serial ports
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MAVLink2
define DEFAULT_SERIAL4_OPTIONS 1024
define DEFAULT_SERIAL4_BAUD 115
@@ -140,6 +140,7 @@ define HAL_OS_FATFS_IO 1
# setup for serial ports
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MAVLink2
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_RCIN
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_ESCTelemetry
@@ -157,6 +157,7 @@ define HAL_OS_FATFS_IO 1
# setup for serial ports
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MAVLink2
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_RCIN
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_ESCTelemetry
@@ -41,6 +41,7 @@ PA9 VBUS INPUT OPENDRAIN
PB14 USART1_TX USART1
PB15 USART1_RX USART1
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# USART2
@@ -113,6 +113,7 @@ define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_GPS
PD9 USART3_RX USART3
PD8 USART3_TX USART3
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART4 (Telem1)
PB9 UART4_TX UART4 NODMA
@@ -115,6 +115,7 @@ define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_None
PD9 USART3_RX USART3
PD8 USART3_TX USART3
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART4 (Telemetry), SERIAL4
PD0 UART4_RX UART4
@@ -120,6 +120,7 @@ define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MAVLink2 # UART7
define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_MAVLink2 # USART1
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_GPS # USART2
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort # UART4:DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_RCIN # USART6
# CAN bus
@@ -89,6 +89,7 @@ define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_GPS
PC6 USART6_TX USART6
PC7 USART6_RX USART6
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART7 (ESC telemetry)
PE7 UART7_RX UART7 NODMA
@@ -76,6 +76,7 @@ SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 EMPTY USART6 UART7 UART8 OTG2
PB7 USART1_RX USART1
PB6 USART1_TX USART1
define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# USART2 (RCin)
PD5 USART2_TX USART2
@@ -80,6 +80,7 @@ define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_MAVLink
PD0 UART4_RX UART4
PD1 UART4_TX UART4
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART5 - ESC Telemetry
PB6 UART5_TX UART5 NODMA
@@ -79,6 +79,7 @@ define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_GPS
PE7 UART7_RX UART7
PE8 UART7_TX UART7
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART8
PE0 UART8_RX UART8 NODMA
@@ -134,6 +134,7 @@ define DEFAULT_SERIAL5_PROTOCOL SerialProtocol_RCIN
PC7 USART6_RX USART6
PC6 USART6_TX USART6
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART7 (telem1)
PE7 UART7_RX UART7 NODMA
@@ -34,6 +34,7 @@ PB5 UART5_RX UART5 NODMA
PB6 UART5_TX UART5 NODMA
# USART6 (DJI FPV)
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_DJI_FPV
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL6_BAUD 115
# UART7
# UART8
@@ -29,6 +29,7 @@ DMA_NOSHARE TIM3* TIM4* TIM5* SPI1* SPI4*
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_ESCTelemetry
define DEFAULT_SERIAL5_PROTOCOL SerialProtocol_SmartAudio
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# other pin defaults come from hwdefs this one includes
define RELAY4_PIN_DEFAULT 83
@@ -106,6 +106,7 @@ define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_GPS
PE7 UART7_RX UART7
PE8 UART7_TX UART7
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART8
PE0 UART8_RX UART8 NODMA
@@ -112,6 +112,7 @@ define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_GPS
PD9 USART3_RX USART3
PD8 USART3_TX USART3
define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
# UART4 (Telem1)
PB9 UART4_TX UART4 NODMA
@@ -85,6 +85,7 @@ define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_RCIN
PE7 UART7_RX UART7
PE8 UART7_TX UART7
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_DJI_FPV
define AP_MSP_VIDEOTX_ENABLED 1
# UART8 (SBUS/SmartAudio)
PE0 UART8_RX UART8 # no suitable timer for RCININT
@@ -174,6 +174,7 @@ define HAL_OS_FATFS_IO 1
#Serial Port defaults
define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_None
define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_MSP_DisplayPort
define AP_MSP_VIDEOTX_ENABLED 1
define DEFAULT_SERIAL7_PROTOCOL SerialProtocol_RCIN
define DEFAULT_SERIAL8_PROTOCOL SerialProtocol_ESCTelemetry