@@ -30,11 +30,6 @@ def generate_launch_description():
3030 )
3131 # TODO(anyone): enable this when added into ROS2-foxy
3232 # choices=['ur3', 'ur3e', 'ur5', 'ur5e', 'ur10', 'ur10e', 'ur16e']))
33- declared_arguments .append (
34- DeclareLaunchArgument (
35- "robot_ip" , description = "IP address by which the robot can be reached."
36- )
37- )
3833 declared_arguments .append (
3934 DeclareLaunchArgument (
4035 "safety_limits" ,
@@ -124,7 +119,6 @@ def generate_launch_description():
124119
125120 # Initialize Arguments
126121 ur_type = LaunchConfiguration ("ur_type" )
127- robot_ip = LaunchConfiguration ("robot_ip" )
128122 safety_limits = LaunchConfiguration ("safety_limits" )
129123 safety_pos_margin = LaunchConfiguration ("safety_pos_margin" )
130124 safety_k_position = LaunchConfiguration ("safety_k_position" )
@@ -167,9 +161,6 @@ def generate_launch_description():
167161 " " ,
168162 PathJoinSubstitution ([FindPackageShare (description_package ), "urdf" , description_file ]),
169163 " " ,
170- "robot_ip:=" ,
171- robot_ip ,
172- " " ,
173164 "joint_limit_params:=" ,
174165 joint_limit_params ,
175166 " " ,
@@ -206,32 +197,17 @@ def generate_launch_description():
206197 "prefix:=" ,
207198 prefix ,
208199 " " ,
209- "use_fake_hardware:=" ,
210- use_fake_hardware ,
211- " " ,
212- "fake_sensor_commands:=" ,
213- fake_sensor_commands ,
214- " " ,
215200 ]
216201 )
217202 robot_description = {"robot_description" : robot_description_content }
218203
219- robot_controllers = PathJoinSubstitution (
220- [FindPackageShare (runtime_config_package ), "config" , controllers_file ]
221- )
222-
223204 rviz_config_file = PathJoinSubstitution (
224205 [FindPackageShare (description_package ), "rviz" , "view_robot.rviz" ]
225206 )
226207
227- control_node = Node (
228- package = "controller_manager" ,
229- executable = "ros2_control_node" ,
230- parameters = [robot_description , robot_controllers ],
231- output = {
232- "stdout" : "screen" ,
233- "stderr" : "screen" ,
234- },
208+ joint_state_publisher_node = Node (
209+ package = "joint_state_publisher_gui" ,
210+ executable = "joint_state_publisher_gui" ,
235211 )
236212
237213 robot_state_publisher_node = Node (
@@ -250,53 +226,10 @@ def generate_launch_description():
250226 arguments = ["-d" , rviz_config_file ],
251227 )
252228
253- joint_state_broadcaster_spawner = Node (
254- package = "controller_manager" ,
255- executable = "spawner.py" ,
256- arguments = ["joint_state_broadcaster" , "--controller-manager" , "/controller_manager" ],
257- )
258-
259- io_and_status_controller_spawner = Node (
260- package = "controller_manager" ,
261- executable = "spawner.py" ,
262- arguments = ["io_and_status_controller" , "-c" , "/controller_manager" ],
263- )
264-
265- speed_scaling_state_broadcaster_spawner = Node (
266- package = "controller_manager" ,
267- executable = "spawner.py" ,
268- arguments = [
269- "speed_scaling_state_broadcaster" ,
270- "--controller-manager" ,
271- "/controller_manager" ,
272- ],
273- )
274-
275- force_torque_sensor_broadcaster_spawner = Node (
276- package = "controller_manager" ,
277- executable = "spawner.py" ,
278- arguments = [
279- "force_torque_sensor_broadcaster" ,
280- "--controller-manager" ,
281- "/controller_manager" ,
282- ],
283- )
284-
285- robot_controller_spawner = Node (
286- package = "controller_manager" ,
287- executable = "spawner.py" ,
288- arguments = [robot_controller , "-c" , "/controller_manager" ],
289- )
290-
291229 nodes_to_start = [
292- control_node ,
230+ joint_state_publisher_node ,
293231 robot_state_publisher_node ,
294232 rviz_node ,
295- joint_state_broadcaster_spawner ,
296- io_and_status_controller_spawner ,
297- speed_scaling_state_broadcaster_spawner ,
298- force_torque_sensor_broadcaster_spawner ,
299- robot_controller_spawner ,
300233 ]
301234
302235 return LaunchDescription (declared_arguments + nodes_to_start )
0 commit comments