From 1eaf745a2f70db10c538f7425ee58784dcfcf87a Mon Sep 17 00:00:00 2001 From: Patrick Wspanialy Date: Fri, 4 Nov 2022 15:46:37 -0400 Subject: [PATCH] update launch file name format to match documentation Signed-off-by: Patrick Wspanialy --- composition/README.md | 2 +- ...omposition_demo.launch.py => composition_demo_launch.py} | 0 ...wo_ints_async.launch.py => add_two_ints_async_launch.py} | 0 ..._ints_async.launch.xml => add_two_ints_async_launch.xml} | 0 .../{add_two_ints.launch.py => add_two_ints_launch.py} | 0 .../{add_two_ints.launch.xml => add_two_ints_launch.xml} | 0 ...ect_services.launch.py => introspect_services_launch.py} | 0 ...fort.launch.py => talker_listener_best_effort_launch.py} | 0 ...rt.launch.xml => talker_listener_best_effort_launch.xml} | 0 ...{talker_listener.launch.py => talker_listener_launch.py} | 0 ...alker_listener.launch.xml => talker_listener_launch.xml} | 0 demo_nodes_cpp/src/services/introspection_client.cpp | 2 +- demo_nodes_cpp/src/services/introspection_service.cpp | 2 +- ...obot_bringup.launch.py => dummy_robot_bringup_launch.py} | 0 lifecycle/README.rst | 2 +- .../{lifecycle_demo.launch.py => lifecycle_demo_launch.py} | 0 .../{lifecycle_demo.launch.py => lifecycle_demo_launch.py} | 0 lifecycle_py/setup.py | 2 +- topic_monitor/README.md | 6 +++--- .../launch/{depth_demo.launch.py => depth_demo_launch.py} | 0 ...entation_demo.launch.py => fragmentation_demo_launch.py} | 0 ...eliability_demo.launch.py => reliability_demo_launch.py} | 0 topic_monitor/setup.py | 2 +- 23 files changed, 9 insertions(+), 9 deletions(-) rename composition/launch/{composition_demo.launch.py => composition_demo_launch.py} (100%) rename demo_nodes_cpp/launch/services/{add_two_ints_async.launch.py => add_two_ints_async_launch.py} (100%) rename demo_nodes_cpp/launch/services/{add_two_ints_async.launch.xml => add_two_ints_async_launch.xml} (100%) rename demo_nodes_cpp/launch/services/{add_two_ints.launch.py => add_two_ints_launch.py} (100%) rename demo_nodes_cpp/launch/services/{add_two_ints.launch.xml => add_two_ints_launch.xml} (100%) rename demo_nodes_cpp/launch/services/{introspect_services.launch.py => introspect_services_launch.py} (100%) rename demo_nodes_cpp/launch/topics/{talker_listener_best_effort.launch.py => talker_listener_best_effort_launch.py} (100%) rename demo_nodes_cpp/launch/topics/{talker_listener_best_effort.launch.xml => talker_listener_best_effort_launch.xml} (100%) rename demo_nodes_cpp/launch/topics/{talker_listener.launch.py => talker_listener_launch.py} (100%) rename demo_nodes_cpp/launch/topics/{talker_listener.launch.xml => talker_listener_launch.xml} (100%) rename dummy_robot/dummy_robot_bringup/launch/{dummy_robot_bringup.launch.py => dummy_robot_bringup_launch.py} (100%) rename lifecycle/launch/{lifecycle_demo.launch.py => lifecycle_demo_launch.py} (100%) rename lifecycle_py/launch/{lifecycle_demo.launch.py => lifecycle_demo_launch.py} (100%) rename topic_monitor/launch/{depth_demo.launch.py => depth_demo_launch.py} (100%) rename topic_monitor/launch/{fragmentation_demo.launch.py => fragmentation_demo_launch.py} (100%) rename topic_monitor/launch/{reliability_demo.launch.py => reliability_demo_launch.py} (100%) diff --git a/composition/README.md b/composition/README.md index 07a28fe0d..da5a42d8b 100644 --- a/composition/README.md +++ b/composition/README.md @@ -54,7 +54,7 @@ ros2 run composition linktime_composition Rather than using the command line tool to run each composition, we can **automate this action** with `ros2 launch` functionality: ```bash -ros2 launch composition composition_demo.launch.py +ros2 launch composition composition_demo_launch.py ``` ## Verify diff --git a/composition/launch/composition_demo.launch.py b/composition/launch/composition_demo_launch.py similarity index 100% rename from composition/launch/composition_demo.launch.py rename to composition/launch/composition_demo_launch.py diff --git a/demo_nodes_cpp/launch/services/add_two_ints_async.launch.py b/demo_nodes_cpp/launch/services/add_two_ints_async_launch.py similarity index 100% rename from demo_nodes_cpp/launch/services/add_two_ints_async.launch.py rename to demo_nodes_cpp/launch/services/add_two_ints_async_launch.py diff --git a/demo_nodes_cpp/launch/services/add_two_ints_async.launch.xml b/demo_nodes_cpp/launch/services/add_two_ints_async_launch.xml similarity index 100% rename from demo_nodes_cpp/launch/services/add_two_ints_async.launch.xml rename to demo_nodes_cpp/launch/services/add_two_ints_async_launch.xml diff --git a/demo_nodes_cpp/launch/services/add_two_ints.launch.py b/demo_nodes_cpp/launch/services/add_two_ints_launch.py similarity index 100% rename from demo_nodes_cpp/launch/services/add_two_ints.launch.py rename to demo_nodes_cpp/launch/services/add_two_ints_launch.py diff --git a/demo_nodes_cpp/launch/services/add_two_ints.launch.xml b/demo_nodes_cpp/launch/services/add_two_ints_launch.xml similarity index 100% rename from demo_nodes_cpp/launch/services/add_two_ints.launch.xml rename to demo_nodes_cpp/launch/services/add_two_ints_launch.xml diff --git a/demo_nodes_cpp/launch/services/introspect_services.launch.py b/demo_nodes_cpp/launch/services/introspect_services_launch.py similarity index 100% rename from demo_nodes_cpp/launch/services/introspect_services.launch.py rename to demo_nodes_cpp/launch/services/introspect_services_launch.py diff --git a/demo_nodes_cpp/launch/topics/talker_listener_best_effort.launch.py b/demo_nodes_cpp/launch/topics/talker_listener_best_effort_launch.py similarity index 100% rename from demo_nodes_cpp/launch/topics/talker_listener_best_effort.launch.py rename to demo_nodes_cpp/launch/topics/talker_listener_best_effort_launch.py diff --git a/demo_nodes_cpp/launch/topics/talker_listener_best_effort.launch.xml b/demo_nodes_cpp/launch/topics/talker_listener_best_effort_launch.xml similarity index 100% rename from demo_nodes_cpp/launch/topics/talker_listener_best_effort.launch.xml rename to demo_nodes_cpp/launch/topics/talker_listener_best_effort_launch.xml diff --git a/demo_nodes_cpp/launch/topics/talker_listener.launch.py b/demo_nodes_cpp/launch/topics/talker_listener_launch.py similarity index 100% rename from demo_nodes_cpp/launch/topics/talker_listener.launch.py rename to demo_nodes_cpp/launch/topics/talker_listener_launch.py diff --git a/demo_nodes_cpp/launch/topics/talker_listener.launch.xml b/demo_nodes_cpp/launch/topics/talker_listener_launch.xml similarity index 100% rename from demo_nodes_cpp/launch/topics/talker_listener.launch.xml rename to demo_nodes_cpp/launch/topics/talker_listener_launch.xml diff --git a/demo_nodes_cpp/src/services/introspection_client.cpp b/demo_nodes_cpp/src/services/introspection_client.cpp index ade6c9e1b..eb1d7aca7 100644 --- a/demo_nodes_cpp/src/services/introspection_client.cpp +++ b/demo_nodes_cpp/src/services/introspection_client.cpp @@ -46,7 +46,7 @@ // // To see this in action, run the following: // -// ros2 launch demo_nodes_cpp introspect_services.launch.py +// ros2 launch demo_nodes_cpp introspect_services_launch.py // Since the default for introspection is 'off', this is no different than // a normal client and server. No additional topics will be made, and // no introspection data will be sent. However, changing the introspection diff --git a/demo_nodes_cpp/src/services/introspection_service.cpp b/demo_nodes_cpp/src/services/introspection_service.cpp index 62484b605..bbe7fc9c9 100644 --- a/demo_nodes_cpp/src/services/introspection_service.cpp +++ b/demo_nodes_cpp/src/services/introspection_service.cpp @@ -43,7 +43,7 @@ // // To see this in action, run the following: // -// ros2 launch demo_nodes_cpp introspect_services.launch.py +// ros2 launch demo_nodes_cpp introspect_services_launch.py // Since the default for introspection is 'off', this is no different than // a normal client and server. No additional topics will be made, and // no introspection data will be sent. However, changing the introspection diff --git a/dummy_robot/dummy_robot_bringup/launch/dummy_robot_bringup.launch.py b/dummy_robot/dummy_robot_bringup/launch/dummy_robot_bringup_launch.py similarity index 100% rename from dummy_robot/dummy_robot_bringup/launch/dummy_robot_bringup.launch.py rename to dummy_robot/dummy_robot_bringup/launch/dummy_robot_bringup_launch.py diff --git a/lifecycle/README.rst b/lifecycle/README.rst index 38d46f811..642d9788f 100644 --- a/lifecycle/README.rst +++ b/lifecycle/README.rst @@ -97,7 +97,7 @@ Alternatively, these three programs can be run together in the same terminal usi .. code-block:: bash - ros2 launch lifecycle lifecycle_demo.launch.py + ros2 launch lifecycle lifecycle_demo_launch.py If we look at the output of the ``lifecycle_talker``\ , we notice that nothing seems to happen. This makes sense, since every node starts as ``unconfigured``. diff --git a/lifecycle/launch/lifecycle_demo.launch.py b/lifecycle/launch/lifecycle_demo_launch.py similarity index 100% rename from lifecycle/launch/lifecycle_demo.launch.py rename to lifecycle/launch/lifecycle_demo_launch.py diff --git a/lifecycle_py/launch/lifecycle_demo.launch.py b/lifecycle_py/launch/lifecycle_demo_launch.py similarity index 100% rename from lifecycle_py/launch/lifecycle_demo.launch.py rename to lifecycle_py/launch/lifecycle_demo_launch.py diff --git a/lifecycle_py/setup.py b/lifecycle_py/setup.py index 039428192..4fb611229 100644 --- a/lifecycle_py/setup.py +++ b/lifecycle_py/setup.py @@ -15,7 +15,7 @@ ['resource/' + package_name]), ('share/' + package_name, ['package.xml']), ('share/lifecycle_py/launch', - glob.glob(os.path.join('launch', '*.launch.py'))), + glob.glob(os.path.join('launch', '*_launch.py'))), ], install_requires=['setuptools'], zip_safe=True, diff --git a/topic_monitor/README.md b/topic_monitor/README.md index 89b75f861..0aec96615 100644 --- a/topic_monitor/README.md +++ b/topic_monitor/README.md @@ -19,7 +19,7 @@ ros2 run topic_monitor topic_monitor --display ### Comparing reliability QoS settings You will need two machines with ROS 2: one mobile and one stationary. -1. Run the `ros2 launch topic_monitor reliability_demo.launch.py` executable on the stationary machine. +1. Run the `ros2 launch topic_monitor reliability_demo_launch.py` executable on the stationary machine. This will start two nodes: one publishing in “reliable” mode, and one in “best effort”. 1. Start the monitor on a mobile machine such as a laptop. Use `ros2 run topic_monitor topic_monitor --display --allowed-latency 5` to account for any latency that may occur re-sending the reliable messages. @@ -54,7 +54,7 @@ If the 10th latest message has not been successfully acknowledged by the time th You will need two machines with ROS 2: one mobile and one stationary. -1. Run the `ros2 launch topic_monitor depth_demo.launch.py` executable on the stationary machine. +1. Run the `ros2 launch topic_monitor depth_demo_launch.py` executable on the stationary machine. This will start some nodes publishing both small (payload of 1-character string) and large data (payload of 100,000-character string) with different depths: a pair publishing with a depth of 1, and a pair with a larger depth (50). 1. Start the monitor on a mobile machine such as a laptop with `ros2 run topic_monitor topic_monitor --display`. 1. Take the mobile machine out of range of the monitor, and observe how the reception rates differ for the different topics. @@ -74,7 +74,7 @@ You will need two machines running ROS 2: one stationary and one mobile. You should not use the Fast RTPS ROS middleware implementation for this part. See [DDS and ROS Middleware Implementations](https://docs.ros.org/en/rolling/Concepts/About-Different-Middleware-Vendors.html) for instructions on how to change the vendor. -1. Run the `ros2 launch topic_monitor fragmentation_demo.launch.py` executable on the stationary machine. +1. Run the `ros2 launch topic_monitor fragmentation_demo_launch.py` executable on the stationary machine. 1. Run `ros2 run topic_monitor topic_monitor --display --expected-period 4` on the mobile machine. This will launch four publishers publishing messages of strings of different lengths: small (1), medium (50000), large (100000) and xlarge (150000). 1. Take the mobile machine out of range of the monitor, and observe how the reception rates differ for the different topics. diff --git a/topic_monitor/launch/depth_demo.launch.py b/topic_monitor/launch/depth_demo_launch.py similarity index 100% rename from topic_monitor/launch/depth_demo.launch.py rename to topic_monitor/launch/depth_demo_launch.py diff --git a/topic_monitor/launch/fragmentation_demo.launch.py b/topic_monitor/launch/fragmentation_demo_launch.py similarity index 100% rename from topic_monitor/launch/fragmentation_demo.launch.py rename to topic_monitor/launch/fragmentation_demo_launch.py diff --git a/topic_monitor/launch/reliability_demo.launch.py b/topic_monitor/launch/reliability_demo_launch.py similarity index 100% rename from topic_monitor/launch/reliability_demo.launch.py rename to topic_monitor/launch/reliability_demo_launch.py diff --git a/topic_monitor/setup.py b/topic_monitor/setup.py index 3fb71f54c..036a92280 100644 --- a/topic_monitor/setup.py +++ b/topic_monitor/setup.py @@ -15,7 +15,7 @@ ['resource/' + package_name]), ('share/' + package_name, ['package.xml']), ('share/topic_monitor/launch', - glob.glob(os.path.join('launch', '*.launch.py'))), + glob.glob(os.path.join('launch', '*_launch.py'))), ], install_requires=[ 'launch',