@@ -33,16 +33,10 @@ def generate_launch_description():
3333 pkg_gazebo = get_package_share_directory ("ros2srrc_ur5_gazebo" )
3434
3535 xacro_file = os .path .join (
36- pkg_gazebo ,
37- "urdf" ,
38- "ur5_robotiq_2f85_with_cams.urdf.xacro"
36+ pkg_gazebo , "urdf" , "ur5_robotiq_2f85_with_cams.urdf.xacro"
3937 )
4038
41- controllers_file = os .path .join (
42- pkg_desc ,
43- "config" ,
44- "ur5_controllers.yaml"
45- )
39+ controllers_file = os .path .join (pkg_desc , "config" , "ur5_controllers.yaml" )
4640
4741 # =========================
4842 # ROBOT DESCRIPTION
@@ -76,9 +70,7 @@ def generate_launch_description():
7670 )
7771 }
7872
79- kinematics_yaml = load_yaml (
80- "ur5_gripper_moveit_config" , "config/kinematics.yaml"
81- )
73+ kinematics_yaml = load_yaml ("ur5_gripper_moveit_config" , "config/kinematics.yaml" )
8274 kinematics_yaml = {
8375 "robot_description_kinematics" : kinematics_yaml ["/**" ]["ros__parameters" ]
8476 }
@@ -109,9 +101,7 @@ def generate_launch_description():
109101 "ros2srrc_robots" , "ur5/config/pilz_cartesian_limits.yaml"
110102 )
111103
112- joint_limits_yaml = load_yaml (
113- "ros2srrc_robots" , "ur5/config/joint_limits.yaml"
114- )
104+ joint_limits_yaml = load_yaml ("ros2srrc_robots" , "ur5/config/joint_limits.yaml" )
115105
116106 combined_planning = {
117107 "robot_description_planning" : {
@@ -174,7 +164,6 @@ def generate_launch_description():
174164 "/hand_camera/image@sensor_msgs/msg/Image@gz.msgs.Image" ,
175165 "/hand_camera/depth_image@sensor_msgs/msg/Image@gz.msgs.Image" ,
176166 "/hand_camera/camera_info@sensor_msgs/msg/CameraInfo@gz.msgs.CameraInfo" ,
177-
178167 "/base_camera/image@sensor_msgs/msg/Image@gz.msgs.Image" ,
179168 "/base_camera/depth_image@sensor_msgs/msg/Image@gz.msgs.Image" ,
180169 "/base_camera/camera_info@sensor_msgs/msg/CameraInfo@gz.msgs.CameraInfo" ,
@@ -228,14 +217,16 @@ def generate_launch_description():
228217 # LAUNCH
229218 # =========================
230219
231- return LaunchDescription ([
232- clock_bridge ,
233- camera_bridge ,
234- robot_state_publisher ,
235- static_tf ,
236- spawn_entity ,
237- joint_state_broadcaster ,
238- joint_trajectory_controller ,
239- gripper_controller ,
240- move_group ,
241- ])
220+ return LaunchDescription (
221+ [
222+ clock_bridge ,
223+ camera_bridge ,
224+ robot_state_publisher ,
225+ static_tf ,
226+ spawn_entity ,
227+ joint_state_broadcaster ,
228+ joint_trajectory_controller ,
229+ gripper_controller ,
230+ move_group ,
231+ ]
232+ )
0 commit comments