Skip to content

Commit

Permalink
Update ros2_control_node initialization (#846)
Browse files Browse the repository at this point in the history
  • Loading branch information
sjahr authored Dec 20, 2023
1 parent 01cd9d0 commit efef1d3
Show file tree
Hide file tree
Showing 15 changed files with 60 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,10 @@ Once our MoveIt configuration is defined we start the following set of nodes:
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="log",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
5 changes: 4 additions & 1 deletion doc/examples/moveit_cpp/launch/moveit_cpp_tutorial.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ def generate_launch_description():
ros2_control_node = launch_ros.actions.Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="screen",
)

Expand Down
5 changes: 4 additions & 1 deletion doc/how_to_guides/chomp_planner/launch/chomp_demo.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="screen",
)

Expand Down
5 changes: 4 additions & 1 deletion doc/how_to_guides/isaac_panda/launch/isaac_demo.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="screen",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ In our example, we have:
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ def launch_setup(context, *args, **kwargs):
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
5 changes: 4 additions & 1 deletion doc/how_to_guides/pick_ik/launch/demo_pick_ik.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ def launch_setup(context, *args, **kwargs):
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.to_dict(), ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down
5 changes: 4 additions & 1 deletion doc/tutorials/quickstart_in_rviz/launch/demo.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ def generate_launch_description():
ros2_control_node = Node(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
parameters=[ros2_controllers_path],
remappings=[
("/controller_manager/robot_description", "/robot_description"),
],
output="both",
)

Expand Down

0 comments on commit efef1d3

Please sign in to comment.