From e9dd248afa4417babb15234517acaf329d54d417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 10 Jun 2024 10:05:36 +0200 Subject: [PATCH 1/2] Rename variable in launch file (#327) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alejandro Hernández Cordero (cherry picked from commit cd0b002c49e71be459f4e9f0a063b97fed195b28) # Conflicts: # gz_ros2_control_demos/launch/tricycle_drive_example.launch.py --- .../launch/tricycle_drive_example.launch.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py b/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py index e5084a87..b6c11b74 100644 --- a/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py +++ b/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py @@ -67,7 +67,7 @@ def generate_launch_description(): output='screen' ) - load_joint_trajectory_controller = ExecuteProcess( + load_tricycle_controller = ExecuteProcess( cmd=['ros2', 'control', 'load_controller', '--set-state', 'active', 'tricycle_controller'], output='screen' @@ -97,8 +97,13 @@ def generate_launch_description(): ), RegisterEventHandler( event_handler=OnProcessExit( +<<<<<<< HEAD target_action=load_joint_state_controller, on_exit=[load_joint_trajectory_controller], +======= + target_action=load_joint_state_broadcaster, + on_exit=[load_tricycle_controller], +>>>>>>> cd0b002 (Rename variable in launch file (#327)) ) ), node_robot_state_publisher, From f624e69a9a4d1190a4c4c46b0926e651cb4c5ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Mon, 10 Jun 2024 10:15:18 +0200 Subject: [PATCH 2/2] Fixed merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero --- .../launch/tricycle_drive_example.launch.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py b/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py index b6c11b74..1fd28d57 100644 --- a/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py +++ b/gz_ros2_control_demos/launch/tricycle_drive_example.launch.py @@ -61,7 +61,7 @@ def generate_launch_description(): '-allow_renaming', 'true'], ) - load_joint_state_controller = ExecuteProcess( + load_joint_state_broadcaster = ExecuteProcess( cmd=['ros2', 'control', 'load_controller', '--set-state', 'active', 'joint_state_broadcaster'], output='screen' @@ -92,18 +92,13 @@ def generate_launch_description(): RegisterEventHandler( event_handler=OnProcessExit( target_action=gz_spawn_entity, - on_exit=[load_joint_state_controller], + on_exit=[load_joint_state_broadcaster], ) ), RegisterEventHandler( event_handler=OnProcessExit( -<<<<<<< HEAD - target_action=load_joint_state_controller, - on_exit=[load_joint_trajectory_controller], -======= target_action=load_joint_state_broadcaster, on_exit=[load_tricycle_controller], ->>>>>>> cd0b002 (Rename variable in launch file (#327)) ) ), node_robot_state_publisher,