Skip to content

Commit efef1d3

Browse files
authored
Update ros2_control_node initialization (#846)
1 parent 01cd9d0 commit efef1d3

File tree

15 files changed

+60
-15
lines changed

15 files changed

+60
-15
lines changed

doc/examples/jupyter_notebook_prototyping/jupyter_notebook_prototyping_tutorial.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ Once our MoveIt configuration is defined we start the following set of nodes:
140140
ros2_control_node = Node(
141141
package="controller_manager",
142142
executable="ros2_control_node",
143-
parameters=[moveit_config.robot_description, ros2_controllers_path],
143+
parameters=[ros2_controllers_path],
144+
remappings=[
145+
("/controller_manager/robot_description", "/robot_description"),
146+
],
144147
output="both",
145148
)
146149

doc/examples/jupyter_notebook_prototyping/launch/jupyter_notebook_prototyping.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ def generate_launch_description():
8888
ros2_control_node = Node(
8989
package="controller_manager",
9090
executable="ros2_control_node",
91-
parameters=[moveit_config.robot_description, ros2_controllers_path],
91+
parameters=[ros2_controllers_path],
92+
remappings=[
93+
("/controller_manager/robot_description", "/robot_description"),
94+
],
9295
output="both",
9396
)
9497

doc/examples/motion_planning_python_api/launch/motion_planning_python_api_tutorial.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ def generate_launch_description():
8080
ros2_control_node = Node(
8181
package="controller_manager",
8282
executable="ros2_control_node",
83-
parameters=[moveit_config.robot_description, ros2_controllers_path],
83+
parameters=[ros2_controllers_path],
84+
remappings=[
85+
("/controller_manager/robot_description", "/robot_description"),
86+
],
8487
output="log",
8588
)
8689

doc/examples/move_group_interface/launch/move_group.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ def generate_launch_description():
6767
ros2_control_node = Node(
6868
package="controller_manager",
6969
executable="ros2_control_node",
70-
parameters=[moveit_config.robot_description, ros2_controllers_path],
70+
parameters=[ros2_controllers_path],
71+
remappings=[
72+
("/controller_manager/robot_description", "/robot_description"),
73+
],
7174
output="both",
7275
)
7376

doc/examples/moveit_cpp/launch/moveit_cpp_tutorial.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ def generate_launch_description():
7171
ros2_control_node = Node(
7272
package="controller_manager",
7373
executable="ros2_control_node",
74-
parameters=[moveit_config.robot_description, ros2_controllers_path],
74+
parameters=[ros2_controllers_path],
75+
remappings=[
76+
("/controller_manager/robot_description", "/robot_description"),
77+
],
7578
output="both",
7679
)
7780

doc/examples/realtime_servo/launch/pose_tracking_tutorial.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ def generate_launch_description():
5656
ros2_control_node = launch_ros.actions.Node(
5757
package="controller_manager",
5858
executable="ros2_control_node",
59-
parameters=[moveit_config.robot_description, ros2_controllers_path],
59+
parameters=[ros2_controllers_path],
60+
remappings=[
61+
("/controller_manager/robot_description", "/robot_description"),
62+
],
6063
output="screen",
6164
)
6265

doc/how_to_guides/chomp_planner/launch/chomp_demo.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ def generate_launch_description():
100100
ros2_control_node = Node(
101101
package="controller_manager",
102102
executable="ros2_control_node",
103-
parameters=[moveit_config.robot_description, ros2_controllers_path],
103+
parameters=[ros2_controllers_path],
104+
remappings=[
105+
("/controller_manager/robot_description", "/robot_description"),
106+
],
104107
output="screen",
105108
)
106109

doc/how_to_guides/isaac_panda/launch/isaac_demo.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ def generate_launch_description():
108108
ros2_control_node = Node(
109109
package="controller_manager",
110110
executable="ros2_control_node",
111-
parameters=[moveit_config.robot_description, ros2_controllers_path],
111+
parameters=[ros2_controllers_path],
112+
remappings=[
113+
("/controller_manager/robot_description", "/robot_description"),
114+
],
112115
output="screen",
113116
)
114117

doc/how_to_guides/moveit_launch_files/moveit_launch_files_tutorial.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,10 @@ In our example, we have:
158158
ros2_control_node = Node(
159159
package="controller_manager",
160160
executable="ros2_control_node",
161-
parameters=[moveit_config.robot_description, ros2_controllers_path],
161+
parameters=[ros2_controllers_path],
162+
remappings=[
163+
("/controller_manager/robot_description", "/robot_description"),
164+
],
162165
output="both",
163166
)
164167

doc/how_to_guides/parallel_planning/launch/parallel_planning_example.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,10 @@ def launch_setup(context, *args, **kwargs):
157157
ros2_control_node = Node(
158158
package="controller_manager",
159159
executable="ros2_control_node",
160-
parameters=[moveit_config.robot_description, ros2_controllers_path],
160+
parameters=[ros2_controllers_path],
161+
remappings=[
162+
("/controller_manager/robot_description", "/robot_description"),
163+
],
161164
output="both",
162165
)
163166

0 commit comments

Comments
 (0)