From 9eaf0352b941d857ab9b80f87d30583b448ff0ce Mon Sep 17 00:00:00 2001 From: Takumi Okamoto Date: Wed, 22 Oct 2025 08:29:58 +0900 Subject: [PATCH 1/2] Fixing misleading Zenoh usage in try-some-example #5954 (#5957) * Revert "Enable Zenoh router to make the post-install example work (#5858)" This reverts commit b684b72d15e27f99bfda7b03ba84f3437fcfce37. * Revert "Enable zenohd to make the post-install example work for Ubuntu Debian. (#5860)" This reverts commit 86d8c1ae7c5b92fd40a827cacfd6610827ac1760. * Added link to RMW implementations page. (cherry picked from commit ecc26c2cb3cc600f420c4618e13c85bae5ab0f8a) # Conflicts: # source/Installation/RHEL-Install-RPMs.rst # source/Installation/Ubuntu-Install-Debs.rst --- source/Installation/RHEL-Install-RPMs.rst | 21 ++++++++++----------- source/Installation/Ubuntu-Install-Debs.rst | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/source/Installation/RHEL-Install-RPMs.rst b/source/Installation/RHEL-Install-RPMs.rst index 6379868c42..a813945dd1 100644 --- a/source/Installation/RHEL-Install-RPMs.rst +++ b/source/Installation/RHEL-Install-RPMs.rst @@ -91,23 +91,14 @@ Try some examples If you installed ``ros-{DISTRO}-desktop`` above you can try some examples. -First, if you use ``Zenoh`` as the RMW implementation, you will require a router for node discovery and communication. - -In one terminal, start the Zenoh router daemon: - -.. code-block:: console - - $ source /opt/ros/{DISTRO}/setup.bash - $ ros2 run rmw_zenoh_cpp rmw_zenohd - -In another terminal, source the setup file and then run a C++ ``talker``\ : +In one terminal, source the setup file and then run a C++ ``talker``\ : .. code-block:: console $ source /opt/ros/{DISTRO}/setup.bash $ ros2 run demo_nodes_cpp talker -In a third terminal source the setup file and then run a Python ``listener``\ : +In another terminal source the setup file and then run a Python ``listener``\ : .. code-block:: console @@ -118,8 +109,16 @@ You should see the ``talker`` saying that it's ``Publishing`` messages and the ` This verifies both the C++ and Python APIs are working properly. Hooray! +<<<<<<< HEAD Next steps after installing --------------------------- +======= +If you want to use other RMW implementations, you can check the :doc:`guide <./RMW-Implementations>`. + +Next steps +---------- + +>>>>>>> ecc26c2 (Fixing misleading Zenoh usage in try-some-example #5954 (#5957)) Continue with the :doc:`tutorials and demos <../../Tutorials>` to configure your environment, create your own workspace and packages, and learn ROS 2 core concepts. Additional RMW implementations (optional) diff --git a/source/Installation/Ubuntu-Install-Debs.rst b/source/Installation/Ubuntu-Install-Debs.rst index f0bdaa34eb..5fe367e44a 100644 --- a/source/Installation/Ubuntu-Install-Debs.rst +++ b/source/Installation/Ubuntu-Install-Debs.rst @@ -99,23 +99,14 @@ Talker-listener If you installed ``ros-{DISTRO}-desktop`` above you can try some examples. -First, if you use ``Zenoh`` as the RMW implementation, you will require a router for node discovery and communication. - -In one terminal, start the Zenoh router daemon: - -.. code-block:: console - - $ source /opt/ros/{DISTRO}/setup.bash - $ ros2 run rmw_zenoh_cpp rmw_zenohd - -In another terminal, source the setup file and then run a C++ ``talker``\ : +In one terminal, source the setup file and then run a C++ ``talker``\ : .. code-block:: console $ source /opt/ros/{DISTRO}/setup.bash $ ros2 run demo_nodes_cpp talker -In a third terminal source the setup file and then run a Python ``listener``\ : +In another terminal source the setup file and then run a Python ``listener``\ : .. code-block:: console @@ -126,8 +117,16 @@ You should see the ``talker`` saying that it's ``Publishing`` messages and the ` This verifies both the C++ and Python APIs are working properly. Hooray! +<<<<<<< HEAD Next steps after installing --------------------------- +======= +If you want to use other RMW implementations, you can check the :doc:`guide <./RMW-Implementations>`. + +Next steps +---------- + +>>>>>>> ecc26c2 (Fixing misleading Zenoh usage in try-some-example #5954 (#5957)) Continue with the :doc:`tutorials and demos <../../Tutorials>` to configure your environment, create your own workspace and packages, and learn ROS 2 core concepts. Using the ROS 1 bridge From 17e00354beed08eba4bc216ba54e940c758c6790 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Wed, 22 Oct 2025 08:36:43 +0900 Subject: [PATCH 2/2] resolve conflicts. Signed-off-by: Tomoya.Fujita --- source/Installation/RHEL-Install-RPMs.rst | 10 ++-------- source/Installation/Ubuntu-Install-Debs.rst | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/source/Installation/RHEL-Install-RPMs.rst b/source/Installation/RHEL-Install-RPMs.rst index a813945dd1..4e3f7b99f5 100644 --- a/source/Installation/RHEL-Install-RPMs.rst +++ b/source/Installation/RHEL-Install-RPMs.rst @@ -109,16 +109,10 @@ You should see the ``talker`` saying that it's ``Publishing`` messages and the ` This verifies both the C++ and Python APIs are working properly. Hooray! -<<<<<<< HEAD -Next steps after installing ---------------------------- -======= If you want to use other RMW implementations, you can check the :doc:`guide <./RMW-Implementations>`. -Next steps ----------- - ->>>>>>> ecc26c2 (Fixing misleading Zenoh usage in try-some-example #5954 (#5957)) +Next steps after installing +--------------------------- Continue with the :doc:`tutorials and demos <../../Tutorials>` to configure your environment, create your own workspace and packages, and learn ROS 2 core concepts. Additional RMW implementations (optional) diff --git a/source/Installation/Ubuntu-Install-Debs.rst b/source/Installation/Ubuntu-Install-Debs.rst index 5fe367e44a..825a176de4 100644 --- a/source/Installation/Ubuntu-Install-Debs.rst +++ b/source/Installation/Ubuntu-Install-Debs.rst @@ -117,16 +117,10 @@ You should see the ``talker`` saying that it's ``Publishing`` messages and the ` This verifies both the C++ and Python APIs are working properly. Hooray! -<<<<<<< HEAD -Next steps after installing ---------------------------- -======= If you want to use other RMW implementations, you can check the :doc:`guide <./RMW-Implementations>`. -Next steps ----------- - ->>>>>>> ecc26c2 (Fixing misleading Zenoh usage in try-some-example #5954 (#5957)) +Next steps after installing +--------------------------- Continue with the :doc:`tutorials and demos <../../Tutorials>` to configure your environment, create your own workspace and packages, and learn ROS 2 core concepts. Using the ROS 1 bridge