Skip to content

Commit c5eb4a1

Browse files
committed
Fix xacro and launcher
1 parent 22e7b7e commit c5eb4a1

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

Industrial/ros2_SimRealRobotControl_gz/packages/ur5/ros2srrc_ur5_gazebo/urdf/ur5_robotiq_2f85.urdf.xacro

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
<xacro:arg name="output_recipe_filename" default="none"/>
5656
<xacro:property name="output_recipe_filename" value="$(arg output_recipe_filename)"/>
5757

58+
<xacro:arg name="simulation_controllers" default=""/>
59+
<xacro:property name="simulation_controllers" value="$(arg simulation_controllers)"/>
60+
5861
<!-- Include XACRO-MACRO file of the UR5: -->
5962
<xacro:include filename="/home/ws/src/Industrial/ros2_SimRealRobotControl_gz/ros2srrc_robots/ur5/urdf/ur5_macro.urdf.xacro"/>
6063
<xacro:ur5
@@ -87,9 +90,7 @@
8790
</hardware>
8891
</ros2_control>
8992

90-
<parameters>/home/ws/src/Industrial/ros2_SimRealRobotControl_gz/ros2srrc_robots/ur5/config/controller.yaml</parameters>
91-
92-
<parameters>/home/ws/src/Industrial/ros2_SimRealRobotControl_gz/ros2srrc_endeffectors/${EE_name}/config/controller.yaml</parameters>
93+
<parameters>${simulation_controllers}</parameters>
9394

9495
</plugin>
9596

Launchers/pick_place_harmonic/pick_place_harmonic.launch.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ def generate_launch_description():
175175
robot_description_semantic,
176176
kinematics_yaml,
177177
{"use_sim_time": True},
178+
{"ROB_PARAM": "ur5"},
179+
{"EE_PARAM": "robotiq_2f85"},
178180
]
179181

180182
move_node = Node(
@@ -198,13 +200,18 @@ def generate_launch_description():
198200
parameters=common_params,
199201
)
200202

203+
delayed_spawn = TimerAction(
204+
period=3.0,
205+
actions=[spawn_robot],
206+
)
207+
201208

202209
return LaunchDescription([
203210

204211
gz,
205212
robot_state_publisher,
206213
clock_bridge,
207-
spawn_robot,
214+
delayed_spawn,
208215

209216
# Controllers chain
210217
RegisterEventHandler(

0 commit comments

Comments
 (0)