-
Notifications
You must be signed in to change notification settings - Fork 17.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tools: add ROS 2 launch tests #23429
Conversation
972a926
to
fce1216
Compare
b4de3e6
to
1839966
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work so far. Going to go ahead and do some testing to validate. A few minor points here and there.
Tools/ros2/ardupilot_dds_tests/ardupilot_dds_tests/time_listener.py
Outdated
Show resolved
Hide resolved
Tools/ros2/ardupilot_dds_tests/launch/micro_ros_agent.launch.py
Outdated
Show resolved
Hide resolved
Tools/ros2/ardupilot_dds_tests/test/test_navsat_msg_received.py
Outdated
Show resolved
Hide resolved
9b18516
to
f251854
Compare
f251854
to
248937d
Compare
Add ros2.repo for installing packages with vcstool. Add cmake custom targets to run waf configure and build. Update ros2.repo. - Add dependency on arshPratap/ardupilot_ros2.git. - Update version used for ardupilot_ros2.git. - Update ardupilot branch. - Reduce to minimum required. Add ROS 2 launch tests. - Add ROS 2 Python package for testing the AP_DDS library. - Initial version including example Python test. - Move the CMakeLists.txt to ./Tools/scripts/ros2/ardupilot_sitl. - Add virtual port test. Update README. - Add instructions for using the docker image. Disable socat tests return code. - Not portable across platforms? Update ros2.repo - Reduce to minimum required. - Update README. - Update ardupilot_dds_tests packahe.xml Use pytest tmp_path_factory. - Use pytest built-in fixture for tmp directories. Update test README. - Update instructions for running test in docker. Add test config and param files. Add subscriber to Time messages. Clean up virtual port test. - Remove unused code. Test time message is published. - Copied from ardupilot_ros2/pr-ci-test-package branch. Update time msg test - Update workspace relative path. - Remove sleep in main test. Add original time message test. - Add original version of time message test to help resolve failure. Use separate processes for sitl and mavproxy. Update original time message test. Add Python testing to the ardupilot_sitl package. - Add support for Python testing in the ardupilot_sitl package. Add install section to CMakeLists.txt. - Install executables and libs. - Install default params and launch files. Add launch for SITL. - Add example launch file for SITL. - Add local param file in config (test install). Update ROS time message test. Update CMakeLists.txt - Set executable bit when installing programs. Add example launch file for mavproxy. Fix param path in sitl.launch. Fix sitl address and port in example dds test. Rename ardupilot dds yaml config file. Rework sitl.launch to support launch arguments. - Add launch arguments. - Prep work for composing launch files. Rework mavproxy.launch to support launch arguments. - Add launch arguments. - Fix default instance in sitl.launch. - Run as MAVProxy in non-interactive mode. Add launch file for socat virtual port process. - Add separate launch file for process creating virtual ports. Rename launch file for creating virtual ports. - Remove unused import. Add sample config yaml for sitl.launch. Update ros2.repos. - Remove ardupilot_ros2 and micro_ros_setup. - Rename branch. Move ROS 2 packages up a level. Update path to ArduPilot root directory in CMakeLists.txt. Update paths in ros2 dds time message tests Update ros2 README and provide separate ros2.repo for macOS. - Add build instructions for each platform. - Provide separate ros2.repos for macOS which has additional dependencies to build from source. Add composite launch for sitl and mavproxy. -Provide example of composite launch that reuses existing launch files. Add uart and serial port arguments to sitl.launch - Add extra (optional) arguments for ports. - Handle default arguments (e.g. wipe and synthetic clock). - Remove use of TextSubstitution which seems redundant. Simplify and update formatting in mavproxy and virtual port launches. - Update print formatting. - Remove use of TextSubstitution. Add launch file for micro_ros_agent. - The launch file in the micro_ros_agent does not have launch arguments. - Replace hardcoded transport. Correct install path for launch files in setup.py. - Correct install path for launch files. - Format line length. Update micro_ros_agent launch. - Do not use None for launch argument default value. Add composite launch file for the time message test. - Compose launch from four simpler launch files. Comment unused variables for linting. Install dds profile. - Update CMakeLists.txt to install the dds_xrceprofile. - Move install location of dds.parm to config/default_params. - Update README with notes on equivalent command line calls. Correct launch for micro_ros_agent. - Remove extra space prefixing device field. - Update README with example launch commands. Update launch examples in README - Update README with example launch commands. Update combined launch for DDS time message test. - Add events to combined launch to control launch sequence. - Update README with example command for combined launch. Remove dds.parm from ardupilot_dds_tests. - File moved to ardupilot_sitl. Update combined launch for DDS time message test. - Disable events as these will not work with a launch description as the target_action. Rename launch file for bringing up sitl with dds. Rename virtual ports launch test. Use PathJoinSubstitution and FindPackageShare for package resolution. - Use substitutions for package and launch path resolution. Update launch example in readme. - Fix typo in combined launch. Update virtual ports test case. Rename virtual ports test case. Rename time message test case. Rework the time msg test case to use previously defined launch files. Add time message check node. Clean up test cases. Move bringup fixture into conftest.py. - Factor out bringup fixture. Remove unused code and imports. Add test for navsatfix. - Update qos profile for navsatfix test. Update test case names. Use pathlib instead of os.path. Set speedup to 10, reduce test timeout. Update CMakeLists.txt - Remove --debug. - Remove commented code. Update sitl_launch.py. - Use max_serial_ports instead of hardcoded number. Remove sample python test. Update maintainer for ros2 packages. Update ros2.repos. - Point to ardupilot master instead of fork and PR branch. Update CMakeLists.txt. - Fix format (indent) in build test section. Enable ament linters and use black formatter. - Enable ament_lint_auto in CMakeLists.txt. - Override default flake8 config to prevent conflicts with black formatter. - Update README. - Update files to satisfy linters. More PEP 257 compliance. - Adopt recommended style for comments. Apply linters and formatter. - Apply linter and black formatter to ardupilot_dds_tests. - Move package tests under folder. - Reinstate copyright, flake8 and pep257 tests. Reorganise ros2 launch files - Move launch files for SITL from ardupilot_dds_tests to ardupilit_sitl. - Update docs. Signed-off-by: Rhys Mainwaring <[email protected]>
248937d
to
3e00ecf
Compare
Update
|
@Ryanf55 are you ok to approve this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Minor updates can be done after it bootstraps.
it does seem a bit weird to me to use colcon to execute cmake to execute waf ... when all three of them are build tools with similar capabilities. |
If ArduPilot supported CMake, then it would only be two, but we're just using what's available. It's a bit of an odd marriage, but that's the best idea we had for this initial version. |
@davidbuzz it seems a bit strange at first, but it's a mechanism to translate ArduPilot's core repo into the ROS world without making any intrusive changes. Here's some of the reasoning behind it: |
This PR adds two
colcon
packages that enablecolcon
to build and test theAP_DDS
library in SITL.There is a brief README in
./Tools/ros2
which includes instructions for running the examples in theDockerfile_dev-ros
Docker image.Related issues
Motivation
The objective is to be able to build and test ArduPilot / ROS 2 integration using
colcon
with commands such as:We'd eventually like to be able to launch a simulation example as
A key requirement is that it should be easy for users familiar with ROS to install and run.
Some non-functional requirements are that the code required to support this be modular and reusable. In particular we'd like to reuse the code for launching in the tests.
Tasks
ros2.repo
file to point to https://github.com/ArduPilot/ardupilot.gitmaster
.Details
Two packages are added to
./Tools/ros2
.ardupilot_sitl
A cmake project with a
colcon
package XML that presents the ArduPilotwaf
build as a cmake project, installing targets into the usual workspace folders expected by a ROS 2colcon
build. There are a couple of example launch files that will form component parts of the larger test suite forAP_DDS
. These allow SITL and a non-interactive mavproxy session to be run from the ROS 2 CLI. For example:The launch files support substitution actions and have launch arguments exposed, so that:
Executables and default parameters are resolved in the launch scripts using the usual ROS 2 package tools.
ardupilot_dds_tests
This package will contain the test suite for the
AP_DDS
library. At present it has a launch file for creating the virtual ports needed for testing SITL:ros2 launch ardupilot_dds_tests virtual_ports.launch.py tty0:=./dev/tty0 tty1:=./dev/tty1 [INFO] [launch]: All log files can be found below /Users/rhys/.ros/log/2023-04-07-14-14-46-569511-MacPro2-2.local-9436 [INFO] [launch]: Default logging verbosity is set to INFO command: socat tty0: ./dev/tty0 tty1: ./dev/tty1 [INFO] [tty1 -1]: process started with pid [9442] [tty1 -1] 2023/04/07 14:14:46 socat[9442] N PTY is /dev/ttys024 [tty1 -1] 2023/04/07 14:14:46 socat[9442] N PTY is /dev/ttys025 [tty1 -1] 2023/04/07 14:14:46 socat[9442] N starting data transfer loop with FDs [5,5] and [7,7]
There is an example test checking the time message published to the topic /ROS2_Time is received.