Skip to content

Commit 71a86bd

Browse files
Fix topic remappings (ros-controls#565)
* Fix remapping for ex2 * Cleanup * Fix remapping of ex15
1 parent 96e6f5c commit 71a86bd

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

example_15/bringup/config/rrbot_namespace_forward_position_publisher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ publisher_forward_position_controller:
33

44
wait_sec_between_publish: 5
55

6-
publish_topic: /rrbot/forward_position_controller/commands
6+
publish_topic: /position_commands
77

88
goal_names: ["pos1", "pos2", "pos3", "pos4"]
99
pos1: [0.785, 0.785]

example_15/bringup/launch/rrbot_namespace.launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ def generate_launch_description():
7171
parameters=[robot_description, robot_controllers],
7272
remappings=[
7373
(
74-
"/forward_position_controller/commands",
74+
# we use the remapping from a relative name to FQN /position_commands
75+
"forward_position_controller/commands",
7576
"/position_commands",
7677
),
7778
],

example_2/bringup/launch/diffbot.launch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ def generate_launch_description():
7575
executable="ros2_control_node",
7676
parameters=[robot_controllers],
7777
output="both",
78+
remappings=[
79+
("/diffbot_base_controller/cmd_vel", "/cmd_vel"),
80+
],
7881
)
7982
robot_state_pub_node = Node(
8083
package="robot_state_publisher",
8184
executable="robot_state_publisher",
8285
output="both",
8386
parameters=[robot_description],
84-
remappings=[
85-
("/diff_drive_controller/cmd_vel_unstamped", "/cmd_vel"),
86-
],
8787
)
8888
rviz_node = Node(
8989
package="rviz2",

example_2/doc/userdoc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Tutorial steps
8888

8989
.. code-block:: shell
9090
91-
ros2 topic pub --rate 30 /diffbot_base_controller/cmd_vel geometry_msgs/msg/TwistStamped "
91+
ros2 topic pub --rate 30 /cmd_vel geometry_msgs/msg/TwistStamped "
9292
twist:
9393
linear:
9494
x: 0.7

example_7/bringup/launch/r6bot_controller.launch.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ def generate_launch_description():
6363
package="controller_manager",
6464
executable="ros2_control_node",
6565
parameters=[robot_controllers],
66-
remappings=[
67-
(
68-
"/forward_position_controller/commands",
69-
"/position_commands",
70-
),
71-
],
7266
output="both",
7367
)
7468
robot_state_pub_node = Node(

0 commit comments

Comments
 (0)