Skip to content

Commit 1d027b5

Browse files
authored
Add ros2_control param for model verification (#410)
Defaulting to disabled and an unknown ur_type, as adding ur_type as a required parameter would effectively be a breaking change.
1 parent 54753f7 commit 1d027b5

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

urdf/ur.ros2_control.xacro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
trajectory_port:=50003
2222
non_blocking_read:=true
2323
keep_alive_count:=2
24+
ur_type:=unknown
25+
verify_robot_model:=false
2426
">
2527

2628
<ros2_control name="${name}" type="system">
@@ -43,6 +45,7 @@
4345
<param name="script_filename">${script_filename}</param>
4446
<param name="output_recipe_filename">${output_recipe_filename}</param>
4547
<param name="input_recipe_filename">${input_recipe_filename}</param>
48+
<param name="ur_type">${ur_type}</param>
4649
<param name="headless_mode">${headless_mode}</param>
4750
<param name="reverse_port">${reverse_port}</param>
4851
<param name="script_sender_port">${script_sender_port}</param>
@@ -64,6 +67,7 @@
6467
<param name="tool_device_name">${tool_device_name}</param>
6568
<param name="tool_tcp_port">${tool_tcp_port}</param>
6669
<param name="keep_alive_count">${keep_alive_count}</param>
70+
<param name="verify_robot_model">${verify_robot_model}</param>
6771
</xacro:unless>
6872
</hardware>
6973
<joint name="${tf_prefix}shoulder_pan_joint">

urdf/ur.urdf.xacro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<xacro:arg name="reverse_port" default="50001"/>
3131
<xacro:arg name="script_sender_port" default="50002"/>
3232
<xacro:arg name="trajectory_port" default="50003"/>
33+
<xacro:arg name="verify_robot_model" default="false" />
3334
<!-- tool communication related parameters-->
3435
<xacro:arg name="use_tool_communication" default="false" />
3536
<xacro:arg name="tool_voltage" default="0" />
@@ -122,6 +123,8 @@
122123
reverse_port="$(arg reverse_port)"
123124
script_sender_port="$(arg script_sender_port)"
124125
trajectory_port="$(arg trajectory_port)"
126+
ur_type="$(arg ur_type)"
127+
verify_robot_model="$(arg verify_robot_model)"
125128
>
126129
<origin xyz="0 0 0" rpy="0 0 0" /> <!-- position robot in the world -->
127130
</xacro:ur_robot>

urdf/ur_macro.xacro

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
kinematics_parameters_file
6363
physical_parameters_file
6464
visual_parameters_file
65+
ur_type:=unknown
6566
generate_ros2_control_tag:=true
6667
transmission_hw_interface:=hardware_interface/PositionJointInterface
6768
safety_limits:=false
@@ -92,7 +93,8 @@
9293
script_command_port:=50004
9394
trajectory_port:=50003
9495
non_blocking_read:=true
95-
keep_alive_count:=2"
96+
keep_alive_count:=2
97+
verify_robot_model:=false"
9698

9799
>
98100

@@ -139,6 +141,8 @@
139141
trajectory_port="${trajectory_port}"
140142
non_blocking_read="${non_blocking_read}"
141143
keep_alive_count="${keep_alive_count}"
144+
ur_type="${ur_type}"
145+
verify_robot_model="${verify_robot_model}"
142146
/>
143147
</xacro:if>
144148

0 commit comments

Comments
 (0)