Skip to content

Commit 00b1a0f

Browse files
Felix ExnerRobertWilbrandt
authored andcommitted
Replace duplicated prefix parameter with tf_prefix
1 parent dcb7db0 commit 00b1a0f

File tree

4 files changed

+70
-72
lines changed

4 files changed

+70
-72
lines changed

launch/view_ur.launch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def generate_launch_description():
8686
)
8787
declared_arguments.append(
8888
DeclareLaunchArgument(
89-
"prefix",
89+
"tf_prefix",
9090
default_value='""',
9191
description="Prefix of the joint names, useful for \
9292
multi-robot setup. If changed than also joint names in the controllers' configuration \
@@ -102,7 +102,7 @@ def generate_launch_description():
102102
# General arguments
103103
description_package = LaunchConfiguration("description_package")
104104
description_file = LaunchConfiguration("description_file")
105-
prefix = LaunchConfiguration("prefix")
105+
tf_prefix = LaunchConfiguration("tf_prefix")
106106

107107
robot_description_content = Command(
108108
[
@@ -125,8 +125,8 @@ def generate_launch_description():
125125
"ur_type:=",
126126
ur_type,
127127
" ",
128-
"prefix:=",
129-
prefix,
128+
"tf_prefix:=",
129+
tf_prefix,
130130
]
131131
)
132132
robot_description = {"robot_description": robot_description_content}

urdf/ur.ros2_control.xacro

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<xacro:macro name="ur_ros2_control" params="
55
name
6-
prefix
76
use_fake_hardware:=false fake_sensor_commands:=false
87
sim_gazebo:=false
98
sim_ignition:=false
@@ -39,7 +38,6 @@
3938
</xacro:if>
4039
<xacro:unless value="${use_fake_hardware or sim_gazebo or sim_ignition}">
4140
<plugin>ur_robot_driver/URPositionHardwareInterface</plugin>
42-
<param name="prefix">${prefix}</param>
4341
<param name="robot_ip">${robot_ip}</param>
4442
<param name="script_filename">${script_filename}</param>
4543
<param name="output_recipe_filename">${output_recipe_filename}</param>
@@ -67,7 +65,7 @@
6765
<param name="keep_alive_count">${keep_alive_count}</param>
6866
</xacro:unless>
6967
</hardware>
70-
<joint name="${prefix}shoulder_pan_joint">
68+
<joint name="${tf_prefix}shoulder_pan_joint">
7169
<command_interface name="position">
7270
<param name="min">{-2*pi}</param>
7371
<param name="max">{2*pi}</param>
@@ -83,7 +81,7 @@
8381
<state_interface name="velocity"/>
8482
<state_interface name="effort"/>
8583
</joint>
86-
<joint name="${prefix}shoulder_lift_joint">
84+
<joint name="${tf_prefix}shoulder_lift_joint">
8785
<command_interface name="position">
8886
<param name="min">{-2*pi}</param>
8987
<param name="max">{2*pi}</param>
@@ -99,7 +97,7 @@
9997
<state_interface name="velocity"/>
10098
<state_interface name="effort"/>
10199
</joint>
102-
<joint name="${prefix}elbow_joint">
100+
<joint name="${tf_prefix}elbow_joint">
103101
<command_interface name="position">
104102
<param name="min">{-pi}</param>
105103
<param name="max">{pi}</param>
@@ -115,7 +113,7 @@
115113
<state_interface name="velocity"/>
116114
<state_interface name="effort"/>
117115
</joint>
118-
<joint name="${prefix}wrist_1_joint">
116+
<joint name="${tf_prefix}wrist_1_joint">
119117
<command_interface name="position">
120118
<param name="min">{-2*pi}</param>
121119
<param name="max">{2*pi}</param>
@@ -131,7 +129,7 @@
131129
<state_interface name="velocity"/>
132130
<state_interface name="effort"/>
133131
</joint>
134-
<joint name="${prefix}wrist_2_joint">
132+
<joint name="${tf_prefix}wrist_2_joint">
135133
<command_interface name="position">
136134
<param name="min">{-2*pi}</param>
137135
<param name="max">{2*pi}</param>
@@ -147,7 +145,7 @@
147145
<state_interface name="velocity"/>
148146
<state_interface name="effort"/>
149147
</joint>
150-
<joint name="${prefix}wrist_3_joint">
148+
<joint name="${tf_prefix}wrist_3_joint">
151149
<command_interface name="position">
152150
<param name="min">{-2*pi}</param>
153151
<param name="max">{2*pi}</param>
@@ -165,7 +163,7 @@
165163
</joint>
166164

167165
<xacro:unless value="${sim_gazebo or sim_ignition}">
168-
<sensor name="${prefix}tcp_fts_sensor">
166+
<sensor name="${tf_prefix}tcp_fts_sensor">
169167
<state_interface name="force.x"/>
170168
<state_interface name="force.y"/>
171169
<state_interface name="force.z"/>
@@ -175,14 +173,14 @@
175173
</sensor>
176174

177175
<!-- NOTE The following are joints used only for testing with fake hardware and will change in the future -->
178-
<gpio name="${prefix}speed_scaling">
176+
<gpio name="${tf_prefix}speed_scaling">
179177
<state_interface name="speed_scaling_factor"/>
180178
<param name="initial_speed_scaling_factor">1</param>
181179
<command_interface name="target_speed_fraction_cmd"/>
182180
<command_interface name="target_speed_fraction_async_success"/>
183181
</gpio>
184182

185-
<gpio name="${prefix}gpio">
183+
<gpio name="${tf_prefix}gpio">
186184
<command_interface name="standard_digital_output_cmd_0"/>
187185
<command_interface name="standard_digital_output_cmd_1"/>
188186
<command_interface name="standard_digital_output_cmd_2"/>
@@ -291,25 +289,25 @@
291289
<state_interface name="program_running"/>
292290
</gpio>
293291

294-
<gpio name="${prefix}payload">
292+
<gpio name="${tf_prefix}payload">
295293
<command_interface name="mass"/>
296294
<command_interface name="cog.x"/>
297295
<command_interface name="cog.y"/>
298296
<command_interface name="cog.z"/>
299297
<command_interface name="payload_async_success"/>
300298
</gpio>
301299

302-
<gpio name="${prefix}resend_robot_program">
300+
<gpio name="${tf_prefix}resend_robot_program">
303301
<command_interface name="resend_robot_program_cmd"/>
304302
<command_interface name="resend_robot_program_async_success"/>
305303
</gpio>
306304

307-
<gpio name="${prefix}zero_ftsensor">
305+
<gpio name="${tf_prefix}zero_ftsensor">
308306
<command_interface name="zero_ftsensor_cmd"/>
309307
<command_interface name="zero_ftsensor_async_success"/>
310308
</gpio>
311309

312-
<gpio name="${prefix}system_interface">
310+
<gpio name="${tf_prefix}system_interface">
313311
<state_interface name="initialized"/>
314312
</gpio>
315313

urdf/ur.urdf.xacro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<xacro:arg name="ur_type" default="ur5x"/>
1111

1212
<!-- parameters -->
13-
<xacro:arg name="prefix" default="" />
13+
<xacro:arg name="tf_prefix" default="" />
1414
<xacro:arg name="joint_limit_params" default="$(find ur_description)/config/$(arg ur_type)/joint_limits.yaml"/>
1515
<xacro:arg name="kinematics_params" default="$(find ur_description)/config/$(arg ur_type)/default_kinematics.yaml"/>
1616
<xacro:arg name="physical_params" default="$(find ur_description)/config/$(arg ur_type)/physical_parameters.yaml"/>
@@ -57,7 +57,7 @@
5757
<!-- arm -->
5858
<xacro:ur_robot
5959
name="$(arg name)"
60-
prefix="$(arg prefix)"
60+
tf_prefix="$(arg tf_prefix)"
6161
parent="world"
6262
joint_limits_parameters_file="$(arg joint_limit_params)"
6363
kinematics_parameters_file="$(arg kinematics_params)"
@@ -110,7 +110,7 @@
110110
<gazebo>
111111
<plugin filename="libign_ros2_control-system.so" name="ign_ros2_control::IgnitionROS2ControlPlugin">
112112
<parameters>$(arg simulation_controllers)</parameters>
113-
<controller_manager_node_name>$(arg prefix)controller_manager</controller_manager_node_name>
113+
<controller_manager_node_name>$(arg tf_prefix)controller_manager</controller_manager_node_name>
114114
</plugin>
115115
</gazebo>
116116
</xacro:if>

0 commit comments

Comments
 (0)