Skip to content

Commit c6e6e8c

Browse files
authored
Merge pull request #309 from andreas-loeffler/fix/launch_parameter
fix node args used to launch joy nodes via launch file
2 parents 881f3a5 + c3e4944 commit c6e6e8c

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

joy/config/joy-params.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
joy_node:
22
ros__parameters:
33
device_id: 0
4-
device_name: "''"
4+
device_name: ""
55
deadzone: 0.5
66
autorepeat_rate: 20.0
77
sticky_buttons: false

joy/launch/joy-composed-launch.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ def generate_launch_description():
4747
params = yaml.safe_load(f)['joy_node']['ros__parameters']
4848

4949
container = ComposableNodeContainer(
50-
node_name='joy_container',
51-
node_namespace='',
50+
name='joy_container',
51+
namespace='',
5252
package='rclcpp_components',
53-
node_executable='component_container',
53+
executable='component_container',
5454
composable_node_descriptions=[
5555
ComposableNode(
5656
package='joy',
57-
node_plugin='joy::Joy',
58-
node_name='joy_node',
57+
plugin='joy::Joy',
58+
name='joy_node',
5959
parameters=[params])
6060
],
6161
output='both',

joy/launch/joy-launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def generate_launch_description():
4040
'config')
4141
params = os.path.join(config_directory, 'joy-params.yaml')
4242
joy_node = launch_ros.actions.Node(package='joy',
43-
node_executable='joy_node',
43+
executable='joy_node',
4444
output='both',
4545
parameters=[params])
4646

0 commit comments

Comments
 (0)