Skip to content

Commit 3e8c86b

Browse files
fmessmerfmessmer
committed
guarantee unique plugin name for hwi_switch_gazebo_ros_control
1 parent fca5bc6 commit 3e8c86b

File tree

13 files changed

+13
-13
lines changed

13 files changed

+13
-13
lines changed

‎cob_description/urdf/cob4_arm/cob4_arm.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330

331331
<!-- ros_control plugin -->
332332
<gazebo>
333-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
333+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
334334
<robotNamespace>${name}</robotNamespace>
335335
<filterJointsParam>joint_names</filterJointsParam>
336336
</plugin>

‎cob_description/urdf/cob4_base/base.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
<!-- ros_control plugin -->
127127
<gazebo>
128-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
128+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
129129
<robotNamespace>${name}</robotNamespace>
130130
<filterJointsParam>joint_names</filterJointsParam>
131131
</plugin>

‎cob_description/urdf/cob4_gripper/gripper.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158

159159
<!-- ros_control plugin -->
160160
<gazebo>
161-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
161+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
162162
<robotNamespace>${name}</robotNamespace>
163163
<filterJointsParam>joint_names</filterJointsParam>
164164
</plugin>

‎cob_description/urdf/cob4_head/head.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<!-- ros_control plugin -->
181181
<xacro:if value="${(dof1 == True) or (dof2 == True) or (dof3 == True)}">
182182
<gazebo>
183-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
183+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
184184
<robotNamespace>${name}</robotNamespace>
185185
<filterJointsParam>joint_names</filterJointsParam>
186186
</plugin>

‎cob_description/urdf/cob4_sensorring/sensorring.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<!-- ros_control plugin -->
7575
<xacro:if value="${active}">
7676
<gazebo>
77-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
77+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
7878
<robotNamespace>${name}</robotNamespace>
7979
<filterJointsParam>joint_names</filterJointsParam>
8080
</plugin>

‎cob_description/urdf/cob4_torso/torso.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<!-- ros_control plugin -->
188188
<xacro:if value="${(dof1 == True) or (dof2 == True) or (dof3 == True)}">
189189
<gazebo>
190-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
190+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
191191
<robotNamespace>${name}</robotNamespace>
192192
<filterJointsParam>joint_names</filterJointsParam>
193193
</plugin>

‎cob_description/urdf/pg70/pg70.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
<!-- ros_control plugin -->
127127
<gazebo>
128-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
128+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
129129
<robotNamespace>${name}</robotNamespace>
130130
<filterJointsParam>joint_names</filterJointsParam>
131131
</plugin>

‎raw_description/urdf/base_long/base.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
<!-- ros_control plugin -->
122122
<gazebo>
123-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
123+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
124124
<robotNamespace>${name}</robotNamespace>
125125
<filterJointsParam>joint_names</filterJointsParam>
126126
</plugin>

‎raw_description/urdf/base_short/base.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

123123
<!-- ros_control plugin -->
124124
<gazebo>
125-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
125+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
126126
<robotNamespace>${name}</robotNamespace>
127127
<filterJointsParam>joint_names</filterJointsParam>
128128
</plugin>

‎raw_description/urdf/torso/torso.urdf.xacro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108

109109
<!-- ros_control plugin -->
110110
<gazebo>
111-
<plugin name="ros_control" filename="libhwi_switch_gazebo_ros_control.so">
111+
<plugin name="${name}_ros_control" filename="libhwi_switch_gazebo_ros_control.so">
112112
<robotNamespace>${name}</robotNamespace>
113113
<filterJointsParam>joint_names</filterJointsParam>
114114
</plugin>

0 commit comments

Comments
 (0)