Skip to content

Commit

Permalink
Fix topic remappings (backport #565) (#566)
Browse files Browse the repository at this point in the history
* Fix topic remappings (#565)

* Fix remapping for ex2

* Cleanup

* Fix remapping of ex15

(cherry picked from commit 71a86bd)

# Conflicts:
#	example_2/bringup/launch/diffbot.launch.py
#	example_7/bringup/launch/r6bot_controller.launch.py

* Fix merge conflicts in diffbot.launch.py

* Fix merge conflicts in r6bot_controller.launch.py

---------

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
mergify[bot] and christophfroehlich authored Aug 12, 2024
1 parent 1d52048 commit 70435a3
Showing 5 changed files with 5 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ publisher_forward_position_controller:

wait_sec_between_publish: 5

publish_topic: /rrbot/forward_position_controller/commands
publish_topic: /position_commands

goal_names: ["pos1", "pos2", "pos3", "pos4"]
pos1: [0.785, 0.785]
3 changes: 2 additions & 1 deletion example_15/bringup/launch/rrbot_namespace.launch.py
Original file line number Diff line number Diff line change
@@ -71,7 +71,8 @@ def generate_launch_description():
parameters=[robot_description, robot_controllers],
remappings=[
(
"/forward_position_controller/commands",
# we use the remapping from a relative name to FQN /position_commands
"forward_position_controller/commands",
"/position_commands",
),
],
4 changes: 1 addition & 3 deletions example_2/bringup/launch/diffbot.launch.py
Original file line number Diff line number Diff line change
@@ -77,16 +77,14 @@ def generate_launch_description():
output="both",
remappings=[
("~/robot_description", "/robot_description"),
("/diffbot_base_controller/cmd_vel", "/cmd_vel"),
],
)
robot_state_pub_node = Node(
package="robot_state_publisher",
executable="robot_state_publisher",
output="both",
parameters=[robot_description],
remappings=[
("/diff_drive_controller/cmd_vel_unstamped", "/cmd_vel"),
],
)
rviz_node = Node(
package="rviz2",
2 changes: 1 addition & 1 deletion example_2/doc/userdoc.rst
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ Tutorial steps

.. code-block:: shell
ros2 topic pub --rate 30 /diffbot_base_controller/cmd_vel geometry_msgs/msg/TwistStamped "
ros2 topic pub --rate 30 /cmd_vel geometry_msgs/msg/TwistStamped "
twist:
linear:
x: 0.7
4 changes: 0 additions & 4 deletions example_7/bringup/launch/r6bot_controller.launch.py
Original file line number Diff line number Diff line change
@@ -65,10 +65,6 @@ def generate_launch_description():
parameters=[robot_controllers],
remappings=[
("~/robot_description", "/robot_description"),
(
"/forward_position_controller/commands",
"/position_commands",
),
],
output="both",
)

0 comments on commit 70435a3

Please sign in to comment.