Skip to content

Commit 43d1088

Browse files
Review "Fast DDS Discovery Server" for Kilted (#5544) (#5545)
(cherry picked from commit 582ec19) Co-authored-by: danielcranston <[email protected]>
1 parent 80f4caa commit 43d1088

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

source/Tutorials/Advanced/Discovery-Server/Discovery-Server.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,11 @@ In several terminals, run the following code to establish a communication with r
203203

204204
.. code-block:: console
205205
206-
$ fastdds discovery --server-id 0 --ip-address 127.0.0.1 --port 11811
206+
$ fastdds discovery --server-id 0 --udp-address 127.0.0.1 --udp-port 11811
207207
208208
.. code-block:: console
209209
210-
$ fastdds discovery --server-id 1 --ip-address 127.0.0.1 --port 11888
210+
$ fastdds discovery --server-id 1 --udp-address 127.0.0.1 --udp-port 11888
211211
212212
``--server-id N`` means server with id N. When referencing the servers with ``ROS_DISCOVERY_SERVER``, server ``0`` must be in first place and server ``1`` in second place.
213213

@@ -263,7 +263,7 @@ In different terminals, run the following code to establish a communication with
263263

264264
.. code-block:: console
265265
266-
$ fastdds discovery --server-id 0 --ip-address 127.0.0.1 --port 11811 --backup
266+
$ fastdds discovery --server-id 0 --udp-address 127.0.0.1 --udp-port 11811 --backup
267267
268268
.. tabs::
269269

@@ -324,13 +324,13 @@ Run the first server listening on localhost with the default port of 11811.
324324

325325
.. code-block:: console
326326
327-
$ fastdds discovery --server-id 0 --ip-address 127.0.0.1 --port 11811
327+
$ fastdds discovery --server-id 0 --udp-address 127.0.0.1 --udp-port 11811
328328
329329
In another terminal run the second server listening on localhost using another port, in this case port 11888.
330330

331331
.. code-block:: console
332332
333-
$ fastdds discovery --server-id 1 --ip-address 127.0.0.1 --port 11888
333+
$ fastdds discovery --server-id 1 --udp-address 127.0.0.1 --udp-port 11888
334334
335335
Now, run each node in a different terminal.
336336
Use ``ROS_DISCOVERY_SERVER`` environment variable to decide which server they are connected to.
@@ -450,7 +450,7 @@ Therefore, this section is devoted to explain how to use ROS 2 CLI with ROS 2 Da
450450
This will allow the Daemon to discover the entire Node graph, and to receive all topic and endpoint information.
451451
To do so, a Fast DDS XML configuration file is used to configure the ROS 2 Daemon and CLI tools.
452452

453-
Below you can find a XML configuration profile, which for this tutorial should be saved in the working directory as ```super_client_configuration_file.xml``` file.
453+
Below you can find a XML configuration profile, which for this tutorial should be saved in the working directory as ``super_client_configuration_file.xml`` file.
454454
This file will configure every new participant using it, as a **Super Client**.
455455

456456
.. code-block:: xml
@@ -540,13 +540,13 @@ Then, instantiate a ROS 2 Daemon using the **Super Client** configuration (remem
540540

541541
.. code-block:: console
542542
543-
$ export FASTRTPS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
543+
$ export FASTDDS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
544544
545545
.. group-tab:: Windows
546546

547547
.. code-block:: console
548548
549-
$ set FASTRTPS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
549+
$ set FASTDDS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
550550
551551
.. code-block:: console
552552
@@ -565,13 +565,13 @@ We can also see the Node's Graph using the ROS 2 tool ``rqt_graph`` as follows (
565565

566566
.. code-block:: console
567567
568-
$ export FASTRTPS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
568+
$ export FASTDDS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
569569
570570
.. group-tab:: Windows
571571

572572
.. code-block:: console
573573
574-
$ set FASTRTPS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
574+
$ set FASTDDS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
575575
576576
.. code-block:: console
577577
@@ -631,21 +631,21 @@ Then, run the talker and listener in separate terminals:
631631
632632
Continue using the ROS 2 CLI with ``--no-daemon`` option with the new configuration.
633633
New nodes will connect with the existing Server and will know every topic.
634-
Exporting ``ROS_DISCOVERY_SERVER`` is not needed as the ROS 2 tools will be configured through the ``FASTRTPS_DEFAULT_PROFILES_FILE``.
634+
Exporting ``ROS_DISCOVERY_SERVER`` is not needed as the ROS 2 tools will be configured through the ``FASTDDS_DEFAULT_PROFILES_FILE``.
635635

636636
.. tabs::
637637

638638
.. group-tab:: Linux
639639

640640
.. code-block:: console
641641
642-
$ export FASTRTPS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
642+
$ export FASTDDS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
643643
644644
.. group-tab:: Windows
645645

646646
.. code-block:: console
647647
648-
$ set FASTRTPS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
648+
$ set FASTDDS_DEFAULT_PROFILES_FILE=super_client_configuration_file.xml
649649
650650
.. code-block:: console
651651
@@ -685,7 +685,7 @@ After both executions are done, run the Python script to generate a graph simila
685685

686686
.. code-block:: console
687687
688-
$ export FASTRTPS_DEFAULT_PROFILES_FILE="no_intraprocess_configuration.xml"
688+
$ export FASTDDS_DEFAULT_PROFILES_FILE="no_intraprocess_configuration.xml"
689689
$ sudo bash generate_discovery_packages.bash ~/ros2/install/local_setup.bash
690690
$ sudo bash generate_discovery_packages.bash ~/ros2/install/local_setup.bash SERVER
691691
$ python3 discovery_packets.py

0 commit comments

Comments
 (0)