|
14 | 14 |
|
15 | 15 |
|
16 | 16 | from launch import LaunchDescription |
17 | | -from launch.actions import DeclareLaunchArgument, RegisterEventHandler |
| 17 | +from launch.actions import DeclareLaunchArgument |
18 | 18 | from launch.conditions import IfCondition |
19 | | -from launch.event_handlers import OnProcessExit |
20 | 19 | from launch.substitutions import Command, LaunchConfiguration, PathSubstitution |
21 | 20 |
|
22 | 21 | from launch_ros.actions import Node |
23 | 22 | from launch_ros.substitutions import FindPackageShare |
24 | 23 |
|
25 | 24 |
|
26 | 25 | def generate_launch_description(): |
27 | | - # Define Node action objects needed to be referenced by RegisterEventHandler |
28 | | - robot_controller_spawner = Node( |
29 | | - package="controller_manager", |
30 | | - executable="spawner", |
31 | | - arguments=[ |
32 | | - "forward_position_controller", |
33 | | - "--param-file", |
34 | | - PathSubstitution(FindPackageShare("ros2_control_demo_example_1")) |
35 | | - / "config" |
36 | | - / "rrbot_controllers.yaml", |
37 | | - ], |
38 | | - ) |
39 | | - |
40 | 26 | return LaunchDescription( |
41 | 27 | [ |
42 | 28 | DeclareLaunchArgument( |
@@ -74,42 +60,32 @@ def generate_launch_description(): |
74 | 60 | } |
75 | 61 | ], |
76 | 62 | ), |
77 | | - # Include the robot_controller_spawner action (starts at launch) |
78 | | - robot_controller_spawner, |
79 | | - # When robot_controller_spawner exits, start the joint_state_broadcaster |
80 | | - RegisterEventHandler( |
81 | | - event_handler=OnProcessExit( |
82 | | - target_action=robot_controller_spawner, |
83 | | - on_exit=[ |
84 | | - joint_state_broadcaster_spawner := Node( |
85 | | - package="controller_manager", |
86 | | - executable="spawner", |
87 | | - arguments=["joint_state_broadcaster"], |
88 | | - ) |
89 | | - ], |
90 | | - ) |
| 63 | + Node( |
| 64 | + package="rviz2", |
| 65 | + executable="rviz2", |
| 66 | + name="rviz2", |
| 67 | + output="log", |
| 68 | + arguments=[ |
| 69 | + "-d", |
| 70 | + PathSubstitution(FindPackageShare("ros2_control_demo_description")) |
| 71 | + / "rrbot/rviz/rrbot.rviz", |
| 72 | + ], |
| 73 | + condition=IfCondition(LaunchConfiguration("gui")), |
91 | 74 | ), |
92 | | - # When joint_state_broadcaster_spawner exits, start RViz |
93 | | - RegisterEventHandler( |
94 | | - event_handler=OnProcessExit( |
95 | | - target_action=joint_state_broadcaster_spawner, |
96 | | - on_exit=[ |
97 | | - Node( |
98 | | - package="rviz2", |
99 | | - executable="rviz2", |
100 | | - name="rviz2", |
101 | | - output="log", |
102 | | - arguments=[ |
103 | | - "-d", |
104 | | - PathSubstitution(FindPackageShare("ros2_control_demo_description")) |
105 | | - / "rrbot" |
106 | | - / "rviz" |
107 | | - / "rrbot.rviz", |
108 | | - ], |
109 | | - condition=IfCondition(LaunchConfiguration("gui")), |
110 | | - ) |
111 | | - ], |
112 | | - ) |
| 75 | + Node( |
| 76 | + package="controller_manager", |
| 77 | + executable="spawner", |
| 78 | + arguments=["joint_state_broadcaster"], |
| 79 | + ), |
| 80 | + Node( |
| 81 | + package="controller_manager", |
| 82 | + executable="spawner", |
| 83 | + parameters=[ |
| 84 | + PathSubstitution(FindPackageShare("ros2_control_demo_example_1")) |
| 85 | + / "config" |
| 86 | + / "rrbot_controllers.yaml" |
| 87 | + ], |
| 88 | + arguments=["forward_position_controller"], |
113 | 89 | ), |
114 | 90 | ] |
115 | 91 | ) |
0 commit comments