Skip to content

Commit 09f1654

Browse files
Nils-ChristianIsekemergify[bot]
authored andcommitted
Add $ to Intermediate and Miscellaneous (#5351)
Signed-off-by: Nils-Christian Iseke <[email protected]> Signed-off-by: Nils-Christian Iseke <[email protected]> Signed-off-by: Christophe Bedard <[email protected]> Co-authored-by: Christophe Bedard <[email protected]> (cherry picked from commit dda0a68) # Conflicts: # source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst
1 parent acfc0c6 commit 09f1654

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed

source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,11 @@ One way is to pass the ``target_frame`` argument to the launch file directly fro
292292

293293
.. code-block:: console
294294
295+
<<<<<<< HEAD
295296
ros2 launch learning_tf2_cpp turtle_tf2_fixed_frame_demo.launch.py target_frame:=carrot1
297+
=======
298+
$ ros2 launch learning_tf2_cpp turtle_tf2_fixed_frame_demo_launch.py target_frame:=carrot1
299+
>>>>>>> dda0a68 (Add $ to Intermediate and Miscellaneous (#5351))
296300

297301
The second way is to update the launch file.
298302
To do so, open the ``turtle_tf2_fixed_frame_demo.launch.py`` file, and add the ``'target_frame': 'carrot1'`` parameter via ``launch_arguments`` argument.
@@ -324,27 +328,27 @@ Inside the ``src`` directory download the dynamic frame broadcaster code by ente
324328

325329
.. code-block:: console
326330
327-
wget https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp
331+
$ wget https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp
328332
329333
.. group-tab:: macOS
330334

331335
.. code-block:: console
332336
333-
wget https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp
337+
$ wget https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp
334338
335339
.. group-tab:: Windows
336340

337341
In a Windows command line prompt:
338342

339343
.. code-block:: console
340344
341-
curl -sk https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp -o dynamic_frame_tf2_broadcaster.cpp
345+
$ curl -sk https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp -o dynamic_frame_tf2_broadcaster.cpp
342346
343347
Or in powershell:
344348

345349
.. code-block:: console
346350
347-
curl https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp -o dynamic_frame_tf2_broadcaster.cpp
351+
$ curl https://raw.githubusercontent.com/ros/geometry_tutorials/ros2/turtle_tf2_cpp/src/dynamic_frame_tf2_broadcaster.cpp -o dynamic_frame_tf2_broadcaster.cpp
348352
349353
Now open the file called ``dynamic_frame_tf2_broadcaster.cpp``:
350354

@@ -463,7 +467,7 @@ Run ``rosdep`` in the root of your workspace to check for missing dependencies.
463467

464468
.. code-block:: console
465469
466-
rosdep install -i --from-path src --rosdistro {DISTRO} -y
470+
$ rosdep install -i --from-path src --rosdistro {DISTRO} -y
467471
468472
.. group-tab:: macOS
469473

@@ -481,19 +485,19 @@ Still in the root of your workspace, build your package:
481485

482486
.. code-block:: console
483487
484-
colcon build --packages-select learning_tf2_cpp
488+
$ colcon build --packages-select learning_tf2_cpp
485489
486490
.. group-tab:: macOS
487491

488492
.. code-block:: console
489493
490-
colcon build --packages-select learning_tf2_cpp
494+
$ colcon build --packages-select learning_tf2_cpp
491495
492496
.. group-tab:: Windows
493497

494498
.. code-block:: console
495499
496-
colcon build --merge-install --packages-select learning_tf2_cpp
500+
$ colcon build --merge-install --packages-select learning_tf2_cpp
497501
498502
Open a new terminal, navigate to the root of your workspace, and source the setup files:
499503

@@ -503,13 +507,13 @@ Open a new terminal, navigate to the root of your workspace, and source the setu
503507

504508
.. code-block:: console
505509
506-
. install/setup.bash
510+
$ . install/setup.bash
507511
508512
.. group-tab:: macOS
509513

510514
.. code-block:: console
511515
512-
. install/setup.bash
516+
$ . install/setup.bash
513517
514518
.. group-tab:: Windows
515519

source/Tutorials/Intermediate/Tf2/Using-Stamped-Datatypes-With-Tf2-Ros-MessageFilter.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -645,11 +645,6 @@ Now if you echo the topic ``turtle3/turtle_point_stamped``:
645645
.. code-block:: console
646646
647647
$ ros2 topic echo /turtle3/turtle_point_stamped
648-
649-
Then there will be output like this:
650-
651-
.. code-block:: console
652-
653648
header:
654649
stamp:
655650
sec: 1629877510

source/Tutorials/Intermediate/URDF/Using-Xacro-to-Clean-Up-a-URDF-File.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ To see the model generated by a xacro file, run the same command as with previou
238238

239239
.. code-block:: console
240240
241-
ros2 launch urdf_tutorial display.launch.py model:=urdf/08-macroed.urdf.xacro
241+
$ ros2 launch urdf_tutorial display.launch.py model:=urdf/08-macroed.urdf.xacro
242242
243243
(The launch file has been running the xacro command this whole time, but since there were no macros to expand, it didn't matter)
244244

source/Tutorials/Intermediate/Writing-an-Action-Server-Client/Py.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ You should see messages printed by the action server as it successfully executes
232232
[INFO] [fibonacci_action_server]: Feedback: array('i', [0, 1, 1, 2])
233233
[INFO] [fibonacci_action_server]: Feedback: array('i', [0, 1, 1, 2, 3])
234234
[INFO] [fibonacci_action_server]: Feedback: array('i', [0, 1, 1, 2, 3, 5])
235-
# etc.
235+
~ etc.
236236
237237
238238
.. group-tab:: macOS
@@ -245,7 +245,7 @@ You should see messages printed by the action server as it successfully executes
245245
[INFO] [fibonacci_action_server]: Feedback: array('i', [0, 1, 1, 2])
246246
[INFO] [fibonacci_action_server]: Feedback: array('i', [0, 1, 1, 2, 3])
247247
[INFO] [fibonacci_action_server]: Feedback: array('i', [0, 1, 1, 2, 3, 5])
248-
# etc.
248+
~ etc.
249249
250250
251251
.. group-tab:: Windows

source/Tutorials/Miscellaneous/Building-Realtime-rt_preempt-kernel-for-ROS-2.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,15 @@ Then we install all kernel deb packages
150150
$ sudo dpkg -i ../*.deb
151151
152152
Now the real time kernel should be installed.
153-
Reboot the system and check the new kernel version
153+
Reboot the system:
154154

155155
.. code-block:: console
156156
157157
$ sudo reboot
158-
uname -a
158+
159+
And check the new kernel version:
160+
161+
.. code-block:: console
162+
163+
$ uname -a
159164
Linux ros2host 5.4.78-rt44 #1 SMP PREEMPT_RT Fri Nov 6 10:37:59 CET 2020 x86_64 xx

0 commit comments

Comments
 (0)