From 9c292c013cb70015d422acfc45d0430c48b15e53 Mon Sep 17 00:00:00 2001 From: "Kimberly N. McGuire" Date: Wed, 21 Aug 2024 16:42:30 +0200 Subject: [PATCH 1/2] Launch large project tutorial fix (#4454) * remove instruction that will fail, inconsistency * add rviz folder in setup.py * add warning for missing environment variable * Update source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst Signed-off-by: Kimberly McGuire Co-authored-by: Chris Lalancette (cherry picked from commit 2a9b2fc65e95c48a1ead7c3160c0cbab6ba56f98) # Conflicts: # source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst --- .../Launch/Using-ROS2-Launch-For-Large-Projects.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst b/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst index 211008d8dbf..1bec2b3db0f 100644 --- a/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst +++ b/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst @@ -218,8 +218,11 @@ Let's now create a configuration file, ``turtlesim.yaml``, in the ``/config`` fo background_g: 86 background_r: 150 +<<<<<<< HEAD If we now start the ``turtlesim_world_2.launch.py`` launch file, we will start the ``turtlesim_node`` with preconfigured background colors. +======= +>>>>>>> 2a9b2fc6 (Launch large project tutorial fix (#4454)) To learn more about using parameters and using YAML files, take a look at the :doc:`Understand parameters <../../Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters>` tutorial. 2.3 Using wildcards in YAML files @@ -475,6 +478,8 @@ Let's now create the last launch file called ``fixed_broadcaster.launch.py`` in This launch file shows the way environment variables can be called inside the launch files. Environment variables can be used to define or push namespaces for distinguishing nodes on different computers or robots. +.. note:: If you are running the launch file where the `USER` environment variable is not defined (like in the ROS docker file), then you can replace the `EnvironmentVariable('USER')` above with any other word of your liking. + Running launch files -------------------- @@ -497,6 +502,8 @@ The ``data_files`` field should now look like this: glob(os.path.join('launch', '*.launch.py'))), (os.path.join('share', package_name, 'config'), glob(os.path.join('config', '*.yaml'))), + (os.path.join('share', package_name, 'rviz'), + glob(os.path.join('config', '*.rviz'))), ], 2 Build and run From fc870b10c55ba732faf79462156c0e0ea53038e1 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 21 Aug 2024 10:47:29 -0400 Subject: [PATCH 2/2] Fix conflict. Signed-off-by: Chris Lalancette --- .../Launch/Using-ROS2-Launch-For-Large-Projects.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst b/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst index 1bec2b3db0f..1fd0d716999 100644 --- a/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst +++ b/source/Tutorials/Intermediate/Launch/Using-ROS2-Launch-For-Large-Projects.rst @@ -218,11 +218,6 @@ Let's now create a configuration file, ``turtlesim.yaml``, in the ``/config`` fo background_g: 86 background_r: 150 -<<<<<<< HEAD -If we now start the ``turtlesim_world_2.launch.py`` launch file, we will start the ``turtlesim_node`` with preconfigured background colors. - -======= ->>>>>>> 2a9b2fc6 (Launch large project tutorial fix (#4454)) To learn more about using parameters and using YAML files, take a look at the :doc:`Understand parameters <../../Beginner-CLI-Tools/Understanding-ROS2-Parameters/Understanding-ROS2-Parameters>` tutorial. 2.3 Using wildcards in YAML files