From 3d4490b339396799d1210ab2cc057f1d600c4224 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 6 Apr 2024 10:00:34 -0500 Subject: [PATCH] Tools/ros2: remove forwarding of deprecated --uartX options --- .../src/ardupilot_sitl/launch.py | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Tools/ros2/ardupilot_sitl/src/ardupilot_sitl/launch.py b/Tools/ros2/ardupilot_sitl/src/ardupilot_sitl/launch.py index 12b7009df9..a85ddefc4e 100644 --- a/Tools/ros2/ardupilot_sitl/src/ardupilot_sitl/launch.py +++ b/Tools/ros2/ardupilot_sitl/src/ardupilot_sitl/launch.py @@ -386,8 +386,6 @@ class MAVProxyLaunch: class SITLLaunch: """Launch functions for ArduPilot SITL.""" - # Labels for the optional uart launch arguments. - UART_LABELS = ["A", "B", "C", "D", "E", "F", "H", "I", "J"] MAX_SERIAL_PORTS = 10 @staticmethod @@ -438,13 +436,6 @@ class SITLLaunch: cmd_args.append(f"--home {home} ") print(f"home: {home}") - # Optional uart arguments. - for label in SITLLaunch.UART_LABELS: - arg = LaunchConfiguration(f"uart{label}").perform(context) - if arg: - cmd_args.append(f"--uart{label} {arg} ") - print(f"uart{label}: {arg}") - # Optional serial arguments. for label in range(10): arg = LaunchConfiguration(f"serial{label}").perform(context) @@ -651,16 +642,6 @@ class SITLLaunch: ), ] - # UART launch arguments. - uart_args = [] - for label in SITLLaunch.UART_LABELS: - arg = DeclareLaunchArgument( - f"uart{label}", - default_value="", - description=f"set device string for UART{label}.", - ) - uart_args.append(arg) - # Serial launch arguments. serial_args = [] for label in range(SITLLaunch.MAX_SERIAL_PORTS): @@ -671,4 +652,4 @@ class SITLLaunch: ) serial_args.append(arg) - return launch_args + uart_args + serial_args + return launch_args + serial_args