Rename variable in launch file (#327)

Co-authored-by: Alejandro Hernández Cordero <[email protected]> (cherry picked from commit cd0b002) # Conflicts: # gz_ros2_control_demos/launch/tricycle_drive_example.launch.py
ros-controls · Jun 10, 2024 · e9dd248 · e9dd248
1 parent aa43f4d
commit e9dd248
Showing 1 changed file with 6 additions and 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
@@ -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,