Skip to content

Commit a79a52b

Browse files
committed
Use new spawner support for allow_substs
1 parent 618d8e6 commit a79a52b

File tree

3 files changed

+31
-13
lines changed

3 files changed

+31
-13
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
controller_manager:
2+
ros__parameters:
3+
update_rate: 10 # Hz
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
controller_manager:
1+
joint_state_broadcaster:
22
ros__parameters:
3-
update_rate: 10 # Hz
4-
5-
joint_state_broadcaster:
6-
type: joint_state_broadcaster/JointStateBroadcaster
3+
type: joint_state_broadcaster/JointStateBroadcaster
4+
update_rate: 50 # Hz
75

86

97
forward_position_controller:
108
ros__parameters:
119
type: forward_command_controller/ForwardCommandController
1210
joints:
13-
- joint1
14-
- joint2
11+
- $(var joint_prefix)1
12+
- $(var joint_prefix)2
1513
interface_name: position

example_1/bringup/launch/rrbot.launch.py

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
from launch_ros.actions import Node
2222
from launch_ros.substitutions import FindPackageShare
23+
from launch_ros.parameter_descriptions import ParameterFile
2324

2425

2526
def generate_launch_description():
@@ -30,14 +31,19 @@ def generate_launch_description():
3031
default_value="true",
3132
description="Start RViz2 automatically with this launch file.",
3233
),
34+
DeclareLaunchArgument(
35+
"joint_prefix",
36+
default_value="joint",
37+
description="Prefix for joint names (used with allow_substs in spawner).",
38+
),
3339
# Control node
3440
Node(
3541
package="controller_manager",
3642
executable="ros2_control_node",
3743
parameters=[
3844
PathSubstitution(FindPackageShare("ros2_control_demo_example_1"))
3945
/ "config"
40-
/ "rrbot_controllers.yaml"
46+
/ "controller_manager.yaml"
4147
],
4248
output="both",
4349
),
@@ -75,17 +81,28 @@ def generate_launch_description():
7581
Node(
7682
package="controller_manager",
7783
executable="spawner",
78-
arguments=["joint_state_broadcaster"],
84+
arguments=[
85+
"joint_state_broadcaster",
86+
"--param-file",
87+
PathSubstitution(FindPackageShare("ros2_control_demo_example_1"))
88+
/ "config"
89+
/ "rrbot_controllers.yaml",
90+
],
7991
),
8092
Node(
8193
package="controller_manager",
8294
executable="spawner",
95+
parameters=[
96+
{"joint_prefix": LaunchConfiguration("joint_prefix")},
97+
ParameterFile(
98+
PathSubstitution(FindPackageShare("ros2_control_demo_example_1"))
99+
/ "config"
100+
/ "rrbot_controllers.yaml",
101+
allow_substs=True,
102+
),
103+
],
83104
arguments=[
84105
"forward_position_controller",
85-
"--param-file",
86-
PathSubstitution(FindPackageShare("ros2_control_demo_example_1"))
87-
/ "config"
88-
/ "rrbot_controllers.yaml",
89106
],
90107
),
91108
]

0 commit comments

Comments
 (0)