Skip to content

Commit e7daea1

Browse files
mergify[bot]MrBearingfujitatomoya
authored
Fixing misleading Zenoh usage in try-some-example #5954 (backport #5957) (#5977)
* 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 b684b72. * Revert "Enable zenohd to make the post-install example work for Ubuntu Debian. (#5860)" This reverts commit 86d8c1a. * Added link to RMW implementations page. (cherry picked from commit ecc26c2) # Conflicts: # source/Installation/RHEL-Install-RPMs.rst # source/Installation/Ubuntu-Install-Debs.rst * resolve conflicts. Signed-off-by: Tomoya.Fujita <[email protected]> --------- Signed-off-by: Tomoya.Fujita <[email protected]> Co-authored-by: Takumi Okamoto <[email protected]> Co-authored-by: Tomoya.Fujita <[email protected]>
1 parent ae7648e commit e7daea1

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

source/Installation/RHEL-Install-RPMs.rst

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,14 @@ Try some examples
9191

9292
If you installed ``ros-{DISTRO}-desktop`` above you can try some examples.
9393

94-
First, if you use ``Zenoh`` as the RMW implementation, you will require a router for node discovery and communication.
95-
96-
In one terminal, start the Zenoh router daemon:
97-
98-
.. code-block:: console
99-
100-
$ source /opt/ros/{DISTRO}/setup.bash
101-
$ ros2 run rmw_zenoh_cpp rmw_zenohd
102-
103-
In another terminal, source the setup file and then run a C++ ``talker``\ :
94+
In one terminal, source the setup file and then run a C++ ``talker``\ :
10495

10596
.. code-block:: console
10697
10798
$ source /opt/ros/{DISTRO}/setup.bash
10899
$ ros2 run demo_nodes_cpp talker
109100
110-
In a third terminal source the setup file and then run a Python ``listener``\ :
101+
In another terminal source the setup file and then run a Python ``listener``\ :
111102

112103
.. code-block:: console
113104
@@ -118,6 +109,8 @@ You should see the ``talker`` saying that it's ``Publishing`` messages and the `
118109
This verifies both the C++ and Python APIs are working properly.
119110
Hooray!
120111

112+
If you want to use other RMW implementations, you can check the :doc:`guide <./RMW-Implementations>`.
113+
121114
Next steps after installing
122115
---------------------------
123116
Continue with the :doc:`tutorials and demos <../../Tutorials>` to configure your environment, create your own workspace and packages, and learn ROS 2 core concepts.

source/Installation/Ubuntu-Install-Debs.rst

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,14 @@ Talker-listener
9999

100100
If you installed ``ros-{DISTRO}-desktop`` above you can try some examples.
101101

102-
First, if you use ``Zenoh`` as the RMW implementation, you will require a router for node discovery and communication.
103-
104-
In one terminal, start the Zenoh router daemon:
105-
106-
.. code-block:: console
107-
108-
$ source /opt/ros/{DISTRO}/setup.bash
109-
$ ros2 run rmw_zenoh_cpp rmw_zenohd
110-
111-
In another terminal, source the setup file and then run a C++ ``talker``\ :
102+
In one terminal, source the setup file and then run a C++ ``talker``\ :
112103

113104
.. code-block:: console
114105
115106
$ source /opt/ros/{DISTRO}/setup.bash
116107
$ ros2 run demo_nodes_cpp talker
117108
118-
In a third terminal source the setup file and then run a Python ``listener``\ :
109+
In another terminal source the setup file and then run a Python ``listener``\ :
119110

120111
.. code-block:: console
121112
@@ -126,6 +117,8 @@ You should see the ``talker`` saying that it's ``Publishing`` messages and the `
126117
This verifies both the C++ and Python APIs are working properly.
127118
Hooray!
128119

120+
If you want to use other RMW implementations, you can check the :doc:`guide <./RMW-Implementations>`.
121+
129122
Next steps after installing
130123
---------------------------
131124
Continue with the :doc:`tutorials and demos <../../Tutorials>` to configure your environment, create your own workspace and packages, and learn ROS 2 core concepts.

0 commit comments

Comments
 (0)