Skip to content

Commit

Permalink
Update ros2_control_demos to use --controller-ros-args
Browse files Browse the repository at this point in the history
  • Loading branch information
saikishor committed Dec 20, 2024
1 parent ceed8cf commit 50476f9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
12 changes: 7 additions & 5 deletions example_11/bringup/launch/carlikebot.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,13 @@ def generate_launch_description():
executable="ros2_control_node",
parameters=[robot_controllers],
output="both",
remappings=[
("/bicycle_steering_controller/tf_odometry", "/tf"),
],
condition=IfCondition(remap_odometry_tf),
)
control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[robot_controllers],
output="both",
remappings=[],
condition=UnlessCondition(remap_odometry_tf),
)
robot_state_pub_bicycle_node = Node(
Expand All @@ -114,7 +110,13 @@ def generate_launch_description():
robot_bicycle_controller_spawner = Node(
package="controller_manager",
executable="spawner",
arguments=["bicycle_steering_controller", "--param-file", robot_controllers],
arguments=[
"bicycle_steering_controller",
"--param-file",
robot_controllers,
"--controller-ros-args",
"'--ros-args -r /bicycle_steering_controller/tf_odometry:=/tf'",
],
)

# Delay rviz start after `joint_state_broadcaster`
Expand Down
15 changes: 7 additions & 8 deletions example_15/bringup/launch/rrbot_namespace.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ def generate_launch_description():
executable="ros2_control_node",
namespace="/rrbot",
parameters=[robot_description, robot_controllers],
remappings=[
(
# we use the remapping from a relative name to FQN /position_commands
"forward_position_controller/commands",
"/position_commands",
),
],
output={
"stdout": "screen",
"stderr": "screen",
Expand Down Expand Up @@ -108,7 +101,13 @@ def generate_launch_description():
package="controller_manager",
executable="spawner",
namespace="rrbot",
arguments=["forward_position_controller", "--param-file", robot_controllers],
arguments=[
"forward_position_controller",
"--param-file",
robot_controllers,
"--controller-ros-args",
"'--ros-args -r forward_position_controller/commands:=/position_commands'",
],
)

robot_position_trajectory_controller_spawner = Node(
Expand Down
11 changes: 7 additions & 4 deletions example_2/bringup/launch/diffbot.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ def generate_launch_description():
executable="ros2_control_node",
parameters=[robot_controllers],
output="both",
remappings=[
("/diffbot_base_controller/cmd_vel", "/cmd_vel"),
],
)
robot_state_pub_node = Node(
package="robot_state_publisher",
Expand All @@ -103,7 +100,13 @@ def generate_launch_description():
robot_controller_spawner = Node(
package="controller_manager",
executable="spawner",
arguments=["diffbot_base_controller", "--param-file", robot_controllers],
arguments=[
"diffbot_base_controller",
"--param-file",
robot_controllers,
"--controller-ros-args",
"'--ros-args -r /diffbot_base_controller/cmd_vel:=/cmd_vel'",
],
)

# Delay rviz start after `joint_state_broadcaster`
Expand Down

0 comments on commit 50476f9

Please sign in to comment.