From 32cdfddf126cb2f01a6f81b7924c931747f41118 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 24 Apr 2020 21:10:08 +1000 Subject: [PATCH] HAL_ChibiOS: convert all hwdef from UART_ORDER to SERIAL_ORDER much easier to understand --- .../AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat | 4 ++-- .../AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat | 2 +- .../hwdef/MatekF405-Wing/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat | 2 +- .../hwdef/MatekF765-Wing/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat | 2 +- .../hwdef/OmnibusNanoV6/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/PH4-mini/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat | 2 +- .../hwdef/TBS-Colibri-F7/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat | 14 +++++++------- libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/iomcu/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat | 2 +- .../hwdef/mRoControlZeroF7/hwdef-bl.dat | 2 +- .../hwdef/mRoControlZeroF7/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat | 4 ++-- .../AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat | 2 +- .../hwdef/skyviper-f412-rev1/hwdef.dat | 2 +- .../hwdef/skyviper-journey/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat | 2 +- .../AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat | 2 +- 97 files changed, 105 insertions(+), 105 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat index 65ff4758df..2ef6c0e150 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat @@ -29,7 +29,7 @@ PC6 LED_BOOTLOADER OUTPUT OPENDRAIN HIGH # green define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 is debug PF6 UART7_RX UART7 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat index 53de3a9e52..7b48c78b1b 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat @@ -21,7 +21,7 @@ STM32_ST_USE_TIMER 2 FLASH_RESERVE_START_KB 128 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART2 USART6 UART4 UART8 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART6 USART1 UART4 UART8 UART7 OTG2 # default the 2nd interface to MAVLink2 until MissionPlanner updates drivers define HAL_OTG2_PROTOCOL SerialProtocol_MAVLink2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat index df534784a1..f5924c1821 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat @@ -29,7 +29,7 @@ PI6 LED_BOOTLOADER OUTPUT OPENDRAIN HIGH # green define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 is debug PF6 UART7_RX UART7 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat index 56473435ed..003cdf5986 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef.dat @@ -21,7 +21,7 @@ STM32_ST_USE_TIMER 2 FLASH_RESERVE_START_KB 128 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART2 USART6 UART4 UART8 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART6 USART1 UART4 UART8 UART7 OTG2 # default the 2nd interface to MAVLink2 until MissionPlanner updates drivers define HAL_OTG2_PROTOCOL SerialProtocol_MAVLink2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat index b3de41f223..ba5234a856 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat @@ -25,7 +25,7 @@ STDOUT_SERIAL SD1 STDOUT_BAUDRATE 57600 # order of UARTs -UART_ORDER +SERIAL_ORDER # use safety button to stay in bootloader PB3 STAY_IN_BOOTLOADER INPUT PULLDOWN diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat index 74a829df1e..ff6ed6e4f5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat @@ -34,7 +34,7 @@ STDOUT_SERIAL SD1 STDOUT_BAUDRATE 57600 # order of UARTs -UART_ORDER USART1 USART2 +SERIAL_ORDER USART1 EMPTY EMPTY USART2 # a LED to flash PB12 LED OUTPUT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat index 6f731d5eee..ee71547530 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat @@ -27,7 +27,7 @@ PC7 LED_ACTIVITY OUTPUT HIGH define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 UART7 +SERIAL_ORDER OTG1 USART2 UART7 # USART2 is telem1 PD6 USART2_RX USART2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat index 93bf786d3e..0f74fda6f5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef.dat @@ -13,7 +13,7 @@ undef PE3 PE3 VDD_3V3_SENSORS_EN OUTPUT LOW # order of UARTs (and USB). -UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 USART1 UART4 USART6 UART7 OTG2 # enable TX on USART6 (disabled for fmuv5 with iomcu) PG14 USART6_TX USART6 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat index 9662c69de6..03b2332322 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat @@ -29,7 +29,7 @@ FLASH_BOOTLOADER_LOAD_KB 128 define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 maps to uartF in the HAL (serial5 in SERIALn_ parameters). PE7 UART7_RX UART7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat index 7b7df25494..b2d6e72adf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat @@ -29,7 +29,7 @@ define HAL_STORAGE_SIZE 16384 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 UART7 OTG2 # If the board has an IOMCU connected via a UART then this defines the # UART to talk to that MCU. Leave it out for boards with no IOMCU. diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat index 6864f28e89..734405ff5f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat @@ -20,7 +20,7 @@ USB_STRING_PRODUCT "CubeYellow-BL" USB_STRING_SERIAL "%SERIAL%" # order of UARTs (and USB) -UART_ORDER OTG1 USART2 USART3 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART7 PD5 USART2_TX USART2 PD6 USART2_RX USART2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat index b0ce49c87e..c505e8db63 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat @@ -55,7 +55,7 @@ FLASH_SIZE_KB 2048 # serial port for stdout. This is optional. If you leave it out then # output from printf() lines will be thrown away (you can stil use # hal.console->printf() for the ArduPilot console, which is the first -# UART in the UART_ORDER list). The value for STDOUT_SERIAL is a +# UART in the SERIAL_ORDER list). The value for STDOUT_SERIAL is a # serial device name, and must be for a serial device for which pins # are defined in this file. For example, SD7 is for UART7 (SD7 == # "serial device 7" in ChibiOS). @@ -100,7 +100,7 @@ I2C_ORDER I2C2 I2C1 # 6) SERIAL5: extra UART (usually RTOS debug console) # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 UART7 OTG2 # if the board has an IOMCU connected via a UART then this defines the # UART to talk to that MCU. Leave it out for boards with no IOMCU diff --git a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat index 8b5e1e3af8..8f939ec478 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat @@ -23,7 +23,7 @@ FLASH_BOOTLOADER_LOAD_KB 16 FLASH_RESERVE_START_KB 0 # uarts and USB to run bootloader protocol on -UART_ORDER OTG1 USART2 USART3 +SERIAL_ORDER OTG1 USART2 USART3 # this is the pin that senses USB being connected. It is an input pin # setup as OPENDRAIN diff --git a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat index 79228f569f..7e89a69420 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat @@ -40,7 +40,7 @@ I2C_ORDER I2C1 I2C2 # 6) SERIAL5: extra UART (usually RTOS debug console) # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART1 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 USART1 UART7 # UART for IOMCU IOMCU_UART USART6 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat index 64d9f85680..5bd9b6af36 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat @@ -34,7 +34,7 @@ define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 is debug PF6 UART7_RX UART7 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat index b5f54b7b6b..843e6b6a76 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat @@ -26,7 +26,7 @@ FLASH_RESERVE_START_KB 128 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 USART1 UART4 USART6 UART7 OTG2 # default the 2nd interface to MAVLink2 until MissionPlanner updates drivers define HAL_OTG2_PROTOCOL SerialProtocol_MAVLink2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat index e8df172837..0ea2b37333 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat @@ -23,7 +23,7 @@ define STORAGE_FLASH_PAGE 1 # order of UARTs -UART_ORDER OTG1 USART1 USART2 UART5 +SERIAL_ORDER OTG1 USART1 USART2 UART5 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index e64391d0b2..2b2ec4463e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat @@ -25,7 +25,7 @@ FLASH_RESERVE_START_KB 64 I2C_ORDER I2C1 # order of UARTs (UART3RX used for RCInput, UART4RX and USART6RX not pinned out) -UART_ORDER OTG1 USART2 USART1 UART5 EMPTY UART4 USART6 +SERIAL_ORDER OTG1 USART1 UART5 USART2 EMPTY UART4 USART6 # USB sensing #PA9 VBUS INPUT OPENDRAIN diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat index 4b165a23ee..803ebbfca3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat @@ -13,7 +13,7 @@ STM32_ST_USE_TIMER 5 FLASH_SIZE_KB 1024 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 +SERIAL_ORDER OTG1 USART2 PE3 LED_BOOTLOADER OUTPUT PE2 LED_ACTIVITY OUTPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat index 3b84082516..9498b1968e 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef.dat @@ -48,7 +48,7 @@ PA14 JTCK-SWCLK SWD # setup as OPENDRAIN PA9 VBUS INPUT OPENDRAIN -UART_ORDER OTG1 USART3 USART2 USART1 UART5 +SERIAL_ORDER OTG1 USART2 USART1 USART3 UART5 # UART1 as board 2.1.5 for serial 3 gps PB6 USART1_TX USART1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat index a61f19b169..5d2f999fd0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat @@ -23,7 +23,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat index 3cb0be9053..2727db105f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat @@ -68,7 +68,7 @@ define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART6 USART1 UART5 USART3 +SERIAL_ORDER OTG1 USART6 USART1 UART4 UART5 USART3 # rcinput is PB11 PB11 TIM2_CH4 TIM2 RCININT FLOAT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat index e77e92c9a6..28a374b8c7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat @@ -23,7 +23,7 @@ FLASH_BOOTLOADER_LOAD_KB 96 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 # PA10 IO-debug-console PA11 OTG_FS_DM OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat index 0d1c90d1f2..19d8ed9de6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat @@ -21,7 +21,7 @@ FLASH_RESERVE_START_KB 96 I2C_ORDER I2C1 # order of UARTs (and USB), USART3 should be in second place to map order with the board's silk screen -UART_ORDER OTG1 USART3 USART1 USART2 UART4 UART7 USART6 +SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 UART7 USART6 # buzzer PD15 TIM4_CH4 TIM4 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat index 072de81744..9bd8f43dc0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat @@ -21,7 +21,7 @@ FLASH_RESERVE_START_KB 96 I2C_ORDER I2C1 # order of UARTs (and USB), USART3 should be in second place to map order with the board's silk screen -UART_ORDER OTG1 USART3 USART1 USART2 UART4 EMPTY USART6 UART7 +SERIAL_ORDER OTG1 USART1 USART2 USART3 UART4 EMPTY USART6 UART7 # buzzer PD15 TIM4_CH4 TIM4 GPIO(77) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat index 908e461680..8ab64c6389 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat @@ -23,7 +23,7 @@ define STORAGE_FLASH_PAGE 1 # order of UARTs -UART_ORDER OTG1 USART1 USART3 UART4 UART5 USART6 +SERIAL_ORDER OTG1 USART1 USART3 UART4 UART5 USART6 PA0 UART4_TX UART4 PA1 UART4_RX UART4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 7b4455bb3d..4b800df908 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -43,7 +43,7 @@ define STORAGE_FLASH_PAGE 1 I2C_ORDER I2C1 I2C2 # order of UARTs -UART_ORDER OTG1 USART3 USART1 EMPTY UART4 UART5 USART6 USART2 +SERIAL_ORDER OTG1 USART1 EMPTY USART3 UART4 UART5 USART6 USART2 ################################################# ### PIN DEFINITIONS ### diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat index a98ca03173..7a15dd51e8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat @@ -25,7 +25,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat index 87b3debea9..c9a4097ccb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat @@ -22,7 +22,7 @@ FLASH_SIZE_KB 1024 I2C_ORDER I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 UART4 UART5 USART2 +SERIAL_ORDER OTG1 USART3 UART4 USART1 UART5 USART2 # LEDs PB9 LED_BLUE OUTPUT LOW GPIO(0) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat index d3cc84550d..e3a292d068 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat @@ -20,7 +20,7 @@ FLASH_BOOTLOADER_LOAD_KB 96 # order of UARTs (and USB). Allow bootloading on USB and telem1 -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 (telem1) PE7 UART7_RX UART7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat index 545958d7f2..575328ef3a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat @@ -23,7 +23,7 @@ define CH_CFG_ST_RESOLUTION 16 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 UART7 USART1 USART3 UART8 UART4 USART6 +SERIAL_ORDER OTG1 UART7 USART1 USART2 USART3 UART8 UART4 USART6 # tonealarm support PB9 TIM11_CH1 TIM11 GPIO(32) ALARM diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat index cdc035f8af..4603c7d49c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat @@ -24,7 +24,7 @@ FLASH_BOOTLOADER_LOAD_KB 128 # order of UARTs (and USB). Allow bootloading on USB and telem1 -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 (telem1) PE7 UART7_RX UART7 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat index 4c00642f93..62b57576e3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat @@ -94,7 +94,7 @@ define HAL_GPIO_B_LED_PIN 90 define HAL_GPIO_LED_OFF 1 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 UART7 USART1 USART3 UART8 UART4 USART6 +SERIAL_ORDER OTG1 UART7 USART1 USART2 USART3 UART8 UART4 USART6 # USART1 (telem2) PA10 USART1_RX USART1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat index 572f8ed7e0..9f15330619 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat @@ -24,7 +24,7 @@ FLASH_BOOTLOADER_LOAD_KB 128 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 # UART7 is debug PF6 UART7_RX UART7 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef.dat index 6dd5764336..7fad7119b1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef.dat @@ -19,7 +19,7 @@ FLASH_RESERVE_START_KB 128 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 EMPTY EMPTY UART7 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat index 46c87bdd4b..52763b48da 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat @@ -19,7 +19,7 @@ FLASH_RESERVE_START_KB 0 FLASH_BOOTLOADER_LOAD_KB 96 -UART_ORDER OTG1 +SERIAL_ORDER OTG1 # PA10 IO-debug-console PA11 OTG_FS_DM OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat index cd2ab9c451..7794757d53 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat @@ -21,7 +21,7 @@ FLASH_RESERVE_START_KB 96 I2C_ORDER I2C2 # order of UARTs (and USB) -UART_ORDER OTG1 USART6 USART1 USART3 USART2 +SERIAL_ORDER OTG1 USART1 USART3 USART6 USART2 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat index eb7cdea69e..c937c5700f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat @@ -27,7 +27,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat index 0bf2ee3e47..390660ad7e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat @@ -20,7 +20,7 @@ FLASH_RESERVE_START_KB 64 I2C_ORDER I2C2 # order of UARTs -UART_ORDER OTG1 USART6 USART1 UART4 +SERIAL_ORDER OTG1 USART1 UART4 USART6 #adc PC1 BAT_CURR_SENS ADC1 SCALE(1) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/PH4-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/PH4-mini/hwdef.dat index 8018db18dd..9bb0ca92d6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/PH4-mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/PH4-mini/hwdef.dat @@ -9,7 +9,7 @@ include ../fmuv5/hwdef.dat STM32_ST_USE_TIMER 5 # order of UARTs (and USB). Telem2 is UART4 on the mini, USART3 is not available -UART_ORDER OTG1 USART1 USART2 UART4 USART6 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 UART4 USART1 USART6 UART7 OTG2 # enable TX on USART6 (disabled for fmuv5 with iomcu) PG14 USART6_TX USART6 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat index ad35fbd0fc..7f14f28674 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat @@ -20,7 +20,7 @@ FLASH_BOOTLOADER_LOAD_KB 96 # order of UARTs (and USB). Allow bootloading on USB -UART_ORDER OTG1 +SERIAL_ORDER OTG1 # PA10 IO-debug-console PA11 OTG_FS_DM OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat index a838e70683..1ae592249d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat @@ -20,7 +20,7 @@ FLASH_RESERVE_START_KB 96 I2C_ORDER I2C3 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART2 USART3 UART5 USART6 UART7 UART8 +SERIAL_ORDER OTG1 USART2 USART3 USART1 UART5 USART6 UART7 UART8 # USB PA11 OTG_FS_DM OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat index 2d1c0bea07..b58c077b67 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat @@ -27,7 +27,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat index 0c403d1497..b4c610e634 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat @@ -52,7 +52,7 @@ PC12 SPI3_MOSI SPI3 I2C_ORDER I2C1 # UART ports and I2C bus -UART_ORDER OTG1 USART3 USART1 USART2 USART6 +SERIAL_ORDER OTG1 USART1 USART2 USART3 USART6 # Note that this board needs pull-ups on I2C pins PB8 I2C1_SCL I2C1 PULLUP diff --git a/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat index 6902c700cd..5e9ec17024 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat @@ -33,7 +33,7 @@ define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 UART7 +SERIAL_ORDER OTG1 USART2 UART7 # USART2 is telem1 PD6 USART2_RX USART2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef.dat index 3e79a34b00..b4a9eb0525 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef.dat @@ -13,7 +13,7 @@ undef PE3 PE3 VDD_3V3_SENSORS_EN OUTPUT LOW # order of UARTs (and USB). Telem2 is UART4 on the mini, USART3 is not available -UART_ORDER OTG1 USART1 USART2 UART4 USART6 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 UART4 USART1 USART6 UART7 OTG2 # enable TX on USART6 (disabled for fmuv5 with iomcu) PG14 USART6_TX USART6 NODMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat index cf402fd066..3f715df0dd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat @@ -35,7 +35,7 @@ STM32_ST_USE_TIMER 5 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA9 VBUS INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat index e1f23d5b2f..669138d008 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef.dat @@ -29,7 +29,7 @@ STM32_ST_USE_TIMER 5 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 USART2 +SERIAL_ORDER OTG1 USART3 USART2 USART1 STDOUT_SERIAL SD3 STDOUT_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat index 2c29cc0366..ced545715e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat @@ -35,7 +35,7 @@ STM32_ST_USE_TIMER 5 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA9 VBUS INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat index 8e81555b98..5ef6ce184e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef.dat @@ -29,7 +29,7 @@ STM32_ST_USE_TIMER 5 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 USART2 +SERIAL_ORDER OTG1 USART3 USART2 USART1 STDOUT_SERIAL SD3 STDOUT_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat index ba8dde574c..c90ad61822 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat @@ -36,7 +36,7 @@ STM32_ST_USE_TIMER 5 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA9 VBUS INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat index a6c07594ec..349964400e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat @@ -30,7 +30,7 @@ STM32_ST_USE_TIMER 5 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 USART2 +SERIAL_ORDER OTG1 USART3 USART2 USART1 STDOUT_SERIAL SD3 STDOUT_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat index 7f9685da41..d89cd0f85d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat @@ -35,7 +35,7 @@ STM32_ST_USE_TIMER 5 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA9 VBUS INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat index ef84856e01..4f8d056ba5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef.dat @@ -29,7 +29,7 @@ STM32_ST_USE_TIMER 5 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 USART2 +SERIAL_ORDER OTG1 USART3 USART2 USART1 STDOUT_SERIAL SD3 STDOUT_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat index 2c14fbc001..0c6feabbd1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat @@ -35,7 +35,7 @@ STM32_ST_USE_TIMER 5 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA9 VBUS INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat index a0aef940b0..dc4832bfdc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat @@ -29,7 +29,7 @@ STM32_ST_USE_TIMER 5 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 USART2 +SERIAL_ORDER OTG1 USART3 USART2 USART1 STDOUT_SERIAL SD3 STDOUT_BAUDRATE 57600 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat index 480a93886b..2219182062 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat @@ -120,7 +120,7 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 0 PA2 USART2_TX USART2 SPEED_HIGH NODMA PA3 USART2_RX USART2 SPEED_HIGH NODMA -UART_ORDER +SERIAL_ORDER define HAL_STORAGE_SIZE 800 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat index de965c2119..82f35b0344 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat @@ -91,7 +91,7 @@ PC12 SPI3_MOSI SPI3 SPEED_HIGH ######################### # order of UARTs -UART_ORDER USART3 USART2 +SERIAL_ORDER USART3 EMPTY EMPTY USART2 SPIDEV ms5611 SPI3 DEVID1 BARO_CS MODE3 8*MHZ 8*MHZ SPIDEV lis3mdl SPI3 DEVID2 MAG_CS MODE3 500*KHZ 500*KHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat index 1b8ad58e86..530766766b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat @@ -27,7 +27,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index 394256d95b..9b2346fe0e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -22,7 +22,7 @@ FLASH_RESERVE_START_KB 64 I2C_ORDER I2C2 # order of UARTs -UART_ORDER OTG1 USART6 USART1 +SERIAL_ORDER OTG1 USART1 EMPTY USART6 #adc PC1 BAT_CURR_SENS ADC1 SCALE(1) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat index f376a3073e..42ba2e4a3d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat @@ -30,7 +30,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat index 88dd7ffb00..341c5e7532 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat @@ -90,7 +90,7 @@ I2C_ORDER I2C3 I2C1 define HAL_I2C_MAX_CLOCK 400000 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 USART3 USART6 +SERIAL_ORDER OTG1 USART3 USART6 USART2 define HAL_STORAGE_SIZE 15360 define STORAGE_FLASH_PAGE 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat index 4920e6fece..6f1e8b464d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat @@ -25,7 +25,7 @@ STDOUT_BAUDRATE 57600 # order of UARTs -UART_ORDER +SERIAL_ORDER define HAL_USE_UART FALSE PA4 LED_BOOTLOADER OUTPUT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat index 7c43f7b129..39bb4a11ea 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat @@ -29,7 +29,7 @@ FLASH_SIZE_KB 128 # order of UARTs -UART_ORDER EMPTY USART1 +SERIAL_ORDER EMPTY EMPTY EMPTY USART1 # a LED to flash PA4 LED OUTPUT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat index 06acab8310..456686e5d1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.dat @@ -25,7 +25,7 @@ STDOUT_BAUDRATE 57600 # order of UARTs -UART_ORDER +SERIAL_ORDER define HAL_USE_UART FALSE PA4 LED_BOOTLOADER OUTPUT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.dat index 56e1408abd..97127114c0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.dat @@ -30,7 +30,7 @@ FLASH_SIZE_KB 256 # order of UARTs -UART_ORDER USART2 USART1 +SERIAL_ORDER USART2 EMPTY EMPTY USART1 # a LED to flash PA4 LED OUTPUT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat index 99f73ae443..d4502ae3d6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat @@ -31,7 +31,7 @@ USB_STRING_SERIAL "%SERIAL%" define BOOTLOADER_BAUDRATE 115200 # uarts and USB to run bootloader protocol on -UART_ORDER OTG1 USART2 USART3 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART7 # this is the pin that senses USB being connected. It is an input pin # setup as OPENDRAIN diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat index da29ec4433..b6db08e02b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat @@ -96,7 +96,7 @@ FLASH_SIZE_KB 2048 # Serial port for stdout. This is optional. If you leave it out then # output from printf() lines will go to the ArduPilot console, which is the -# first UART in the UART_ORDER list. But note that some startup code +# first UART in the SERIAL_ORDER list. But note that some startup code # runs before USB is set up. # The value for STDOUT_SERIAL is a serial device name, and must be for a # serial device for which pins are defined in this file. For example, SD7 @@ -125,21 +125,21 @@ USB_STRING_PRODUCT "%BOARD%" # order of I2C buses I2C_ORDER I2C2 I2C1 -# Now the UART order. These map to the hal.uartA to hal.uartF -# objects. If you use a shorter list then HAL_Empty::UARTDriver +# Now the serial ordering. These map to the SERIALn_ parameter numbers +# If you use a shorter list then HAL_Empty::UARTDriver # objects are substituted for later UARTs, or you can leave a gap by # listing one or more of the uarts as EMPTY. # The normal usage of this ordering is: # 1) SERIAL0: console (primary mavlink, usually USB) -# 2) SERIAL3: primary GPS -# 3) SERIAL1: telem1 -# 4) SERIAL2: telem2 +# 2) SERIAL1: telem1 +# 3) SERIAL2: telem2 +# 4) SERIAL3: primary GPS # 5) SERIAL4: GPS2 # 6) SERIAL5: extra UART (usually RTOS debug console) # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 UART7 # If the board has an IOMCU connected via a UART then this defines the # UART to talk to that MCU. Leave it out for boards with no IOMCU. diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat index 634b324f40..3ffc78329f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat @@ -18,7 +18,7 @@ STM32_ST_USE_TIMER 5 FLASH_SIZE_KB 2048 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 +SERIAL_ORDER OTG1 USART2 PB1 LED_BOOTLOADER OUTPUT PB3 LED_ACTIVITY OUTPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat index e932cf4cd7..c339479a2b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat @@ -33,7 +33,7 @@ define HAL_I2C_BUS_BASE 1 define HAL_I2C_INTERNAL_MASK 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART1 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 USART1 UART7 # UART4 is GPS PA0 UART4_TX UART4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat index bd21621fbe..ed3006b34c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat @@ -24,7 +24,7 @@ define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 UART7 +SERIAL_ORDER OTG1 USART2 UART7 # USART2 is telem1 PD6 USART2_RX USART2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat index 40e9e0a926..38d9e9736a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat @@ -23,7 +23,7 @@ FLASH_SIZE_KB 2048 env OPTIMIZE -O2 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 USART1 UART4 USART6 UART7 OTG2 # default the 2nd interface to MAVLink2 until MissionPlanner updates drivers define HAL_OTG2_PROTOCOL SerialProtocol_MAVLink2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/iomcu/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/iomcu/hwdef.dat index 8ad75aebe2..fc1b70a2e1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/iomcu/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/iomcu/hwdef.dat @@ -20,7 +20,7 @@ FLASH_SIZE_KB 64 # order of UARTs -UART_ORDER EMPTY +SERIAL_ORDER EMPTY EMPTY EMPTY EMPTY define HAL_USE_UART TRUE # UART connected to FMU, uses DMA diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat index 7fcc777837..eeb134b5bc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat @@ -29,7 +29,7 @@ define HAL_I2C_BUS_BASE 1 define HAL_I2C_INTERNAL_MASK 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART1 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 USART1 UART7 # UART4 is GPS PA0 UART4_TX UART4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat index f2d4f505e5..2c44887684 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat @@ -32,7 +32,7 @@ define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 # UART7 maps to uartF in the HAL (serial5 in SERIALn_ parameters). PE7 UART7_RX UART7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat index 6187281579..3440a6bcac 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat @@ -63,7 +63,7 @@ define HAL_I2C_INTERNAL_MASK 0 # USART6 FC # UART7 DEBUG -UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART6 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 USART6 UART7 OTG2 # default the 2nd interface to MAVLink2 until MissionPlanner updates drivers define HAL_OTG2_PROTOCOL SerialProtocol_MAVLink2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat index 23786146df..e6f479c22a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat @@ -34,7 +34,7 @@ define HAL_LED_ON 0 # order of UARTs (and USB) -UART_ORDER OTG1 UART7 +SERIAL_ORDER OTG1 UART7 PE7 UART7_RX UART7 PE8 UART7_TX UART7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat index 17b5dfe935..d3a62b4590 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef.dat @@ -38,7 +38,7 @@ I2C_ORDER I2C4 # UART7 SERIAL1 # OTG2 SERIAL2 -UART_ORDER OTG1 UART4 UART7 OTG2 +SERIAL_ORDER OTG1 UART7 OTG2 UART4 # UART4 SERIAL0 (GPS) PD0 UART4_RX UART4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat index 152916397b..8b0611cbbe 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat @@ -25,7 +25,7 @@ USB_STRING_PRODUCT "X2.1-777" USB_STRING_SERIAL "%SERIAL%" # order of UARTs (and USB) -UART_ORDER OTG1 USART2 USART3 UART7 +SERIAL_ORDER OTG1 USART2 USART3 UART7 PD5 USART2_TX USART2 PD6 USART2_RX USART2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat index 7b4ff6e8c0..77e26af0ff 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat @@ -61,7 +61,7 @@ env OPTIMIZE -O2 # serial port for stdout. This is optional. If you leave it out then # output from printf() lines will be thrown away (you can stil use # hal.console->printf() for the ArduPilot console, which is the first -# UART in the UART_ORDER list). The value for STDOUT_SERIAL is a +# UART in the SERIAL_ORDER list). The value for STDOUT_SERIAL is a # serial device name, and must be for a serial device for which pins # are defined in this file. For example, SD7 is for UART7 (SD7 == # "serial device 7" in ChibiOS). @@ -99,7 +99,7 @@ I2C_ORDER I2C1 # 6) SERIAL5: extra UART (usually RTOS debug console) # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 UART7 OTG2 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 UART7 OTG2 # default the 2nd interface to MAVLink2 until MissionPlanner updates drivers define HAL_OTG2_PROTOCOL SerialProtocol_MAVLink2 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat index 3c33e5c4a7..1f0a23d9f7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat @@ -25,7 +25,7 @@ FLASH_BOOTLOADER_LOAD_KB 16 FLASH_RESERVE_START_KB 0 # order of UARTs (and USB) -UART_ORDER OTG1 USART2 +SERIAL_ORDER OTG1 USART2 PA9 VBUS INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat index b2185f96bf..21da3e8499 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat @@ -31,7 +31,7 @@ FLASH_RESERVE_END_KB 0 I2C_ORDER I2C1 I2C2 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART1 UART7 USART6 +SERIAL_ORDER OTG1 USART2 USART3 UART4 UART8 USART1 UART7 USART6 # UART4 is GPS PA0 UART4_TX UART4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat index 03f165fae1..c424c1f2e1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat @@ -29,7 +29,7 @@ FLASH_BOOTLOADER_LOAD_KB 16 # order of UARTs (and USB) -UART_ORDER OTG1 +SERIAL_ORDER OTG1 # USB pins PA11 OTG_FS_DM OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat index f08d63a2ff..aebe028540 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat @@ -24,7 +24,7 @@ FLASH_SIZE_KB 1024 I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART3 USART2 USART6 +SERIAL_ORDER OTG1 USART3 USART2 UART4 USART6 # UART4 serial GPS PA0 UART4_TX UART4 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat index 2b31f49abf..19cb64f2c0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat @@ -27,7 +27,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index 0540d1ac49..521884a15b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -22,7 +22,7 @@ FLASH_RESERVE_START_KB 64 I2C_ORDER I2C2 # order of UARTs -UART_ORDER OTG1 USART6 USART1 USART3 UART4 +SERIAL_ORDER OTG1 USART1 USART3 USART6 UART4 #adc PC1 BAT_CURR_SENS ADC1 SCALE(1) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat index 3c64394e49..9a915219cb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat @@ -27,7 +27,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat index 2fd9845596..e2de0a229d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat @@ -24,7 +24,7 @@ I2C_ORDER I2C1 # order of UARTs -UART_ORDER OTG1 USART6 USART1 UART4 USART3 USART2 +SERIAL_ORDER OTG1 USART1 UART4 USART6 USART3 USART2 #PINS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat index d7dba731a7..078b88a03f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat @@ -28,7 +28,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat index b32d3012e1..25f5e1fd6e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat @@ -23,7 +23,7 @@ FLASH_SIZE_KB 1024 I2C_ORDER I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART3 USART1 +SERIAL_ORDER OTG1 USART1 EMPTY USART3 # rcinput is PC6, which is the 3rd "PWM IN" pin (the yellow wire on a # revolution board) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat index 6526ee2498..578c1aee4f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat @@ -33,7 +33,7 @@ STDOUT_BAUDRATE 115200 I2C_ORDER I2C2 I2C1 # order of UARTs -UART_ORDER USART2 USART6 USART3 +SERIAL_ORDER USART2 USART3 EMPTY USART6 PC0 MGND ADC1 PC1 PWM4_SENSE ADC1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat index 08a32df0c9..9e6452b1d8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat @@ -39,7 +39,7 @@ define HAL_I2C_MAX_CLOCK 400000 define APM_I2C_PRIORITY 181 # order of UARTs -UART_ORDER USART1 USART6 USART2 +SERIAL_ORDER USART1 USART2 EMPTY USART6 PC0 MGND ADC1 PC1 PWM4_SENSE ADC1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat index 96152fdd93..d6ae555f30 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat @@ -27,7 +27,7 @@ undef SDIO undef HAL_BOARD_LOG_DIRECTORY undef HAL_BOARD_TERRAIN_DIRECTORY -UART_ORDER OTG1 UART4 USART2 +SERIAL_ORDER OTG1 USART2 EMPTY UART4 # enable AP_Radio support define HAL_RCINPUT_WITH_AP_RADIO 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat index 6eb827917b..d6dad2cdea 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat @@ -28,7 +28,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index 542a68638c..f2a803fcf6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -45,7 +45,7 @@ PA8 VBUS INPUT OPENDRAIN # ---------UARTS----------- # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART3 +SERIAL_ORDER OTG1 USART3 EMPTY USART1 # Main PORT PA9 USART1_TX USART1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat index ad67982b5a..59ecaf6ec0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat @@ -27,7 +27,7 @@ FLASH_BOOTLOADER_LOAD_KB 64 # order of UARTs -UART_ORDER OTG1 +SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat index 88e32780c2..5b1375cc9c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat @@ -21,7 +21,7 @@ FLASH_SIZE_KB 1024 I2C_ORDER I2C1 # order of UARTs (and USB) -UART_ORDER OTG1 USART3 USART1 UART4 UART5 +SERIAL_ORDER OTG1 USART1 UART4 USART3 UART5 # LEDs PB9 LED_BLUE OUTPUT LOW GPIO(0)