Skip to content

Commit 3d1991e

Browse files
committed
Rename main joint
1 parent 8b77af3 commit 3d1991e

6 files changed

+16
-16
lines changed

robotiq_control/config/cmodel_action_controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ gripper_action_controller:
1313
min_force: 40.0
1414
max_force: 100.0
1515
# Joint name
16-
joint_name: robotiq_85_left_knuckle_joint
16+
joint_name: finger_joint

robotiq_control/config/gripper_85_controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
gripper_controller:
33
gripper_type: '85'
44
type: position_controllers/GripperActionController
5-
joint: robotiq_85_left_knuckle_joint
5+
joint: finger_joint
66
action_monitor_rate: 20
77
goal_tolerance: 0.002
88
max_effort: 100

robotiq_control/scripts/cmodel_action_controller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(self, activate=True):
3131
self._max_speed = read_parameter(self._ns + 'gripper_action_controller/max_speed', 0.1)
3232
self._min_force = read_parameter(self._ns + 'gripper_action_controller/min_force', 40.0)
3333
self._max_force = read_parameter(self._ns + 'gripper_action_controller/max_force', 100.0)
34-
self._joint_name = read_parameter(self._ns + 'gripper_action_controller/joint_name', 'robotiq_85_left_knuckle_joint')
34+
self._joint_name = read_parameter(self._ns + 'gripper_action_controller/joint_name', 'finger_joint')
3535
self._gripper_prefix = read_parameter(self._ns + 'gripper_prefix', "") # Used for updating joint state
3636
# Configure and start the action server
3737
self._status = CModelStatus()

robotiq_description/urdf/robotiq_85_gripper.transmission.xacro

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<transmission name="${prefix}robotiq_85_left_knuckle_trans">
77
<type>transmission_interface/SimpleTransmission</type>
8-
<joint name="${prefix}robotiq_85_left_knuckle_joint">
8+
<joint name="${prefix}finger_joint">
99
<hardwareInterface>hardware_interface/PositionJointInterface</hardwareInterface>
1010
</joint>
1111
<actuator name="${prefix}robotiq_85_left_knuckle_motor">
@@ -17,25 +17,25 @@
1717
<!-- Mimic joints -->
1818
<gazebo>
1919
<plugin filename="libgazebo_mimic_joint_plugin.so" name="${prefix}mimic_robotiq_85_1">
20-
<joint>${prefix}robotiq_85_left_knuckle_joint</joint>
20+
<joint>${prefix}finger_joint</joint>
2121
<mimicJoint>${prefix}robotiq_85_right_knuckle_joint</mimicJoint>
2222
</plugin>
2323
<plugin filename="libgazebo_mimic_joint_plugin.so" name="${prefix}mimic_robotiq_85_2">
24-
<joint>${prefix}robotiq_85_left_knuckle_joint</joint>
24+
<joint>${prefix}finger_joint</joint>
2525
<mimicJoint>${prefix}robotiq_85_left_inner_knuckle_joint</mimicJoint>
2626
</plugin>
2727
<plugin filename="libgazebo_mimic_joint_plugin.so" name="${prefix}mimic_robotiq_85_3">
28-
<joint>${prefix}robotiq_85_left_knuckle_joint</joint>
28+
<joint>${prefix}finger_joint</joint>
2929
<mimicJoint>${prefix}robotiq_85_right_inner_knuckle_joint</mimicJoint>
3030
</plugin>
3131
<plugin filename="libgazebo_mimic_joint_plugin.so" name="${prefix}mimic_robotiq_85_4">
32-
<joint>${prefix}robotiq_85_left_knuckle_joint</joint>
32+
<joint>${prefix}finger_joint</joint>
3333
<mimicJoint>${prefix}robotiq_85_left_finger_tip_joint</mimicJoint>
3434
<multiplier>-1.0</multiplier>
3535
<offset>0.0</offset>
3636
</plugin>
3737
<plugin filename="libgazebo_mimic_joint_plugin.so" name="${prefix}mimic_robotiq_85_5">
38-
<joint>${prefix}robotiq_85_left_knuckle_joint</joint>
38+
<joint>${prefix}finger_joint</joint>
3939
<mimicJoint>${prefix}robotiq_85_right_finger_tip_joint</mimicJoint>
4040
<multiplier>-1.0</multiplier>
4141
<offset>0.0</offset>

robotiq_description/urdf/robotiq_85_gripper.urdf.xacro

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</inertial>
3333
</link>
3434

35-
<joint name="${prefix}robotiq_85_left_knuckle_joint" type="revolute">
35+
<joint name="${prefix}finger_joint" type="revolute">
3636
<parent link="${prefix}robotiq_85_base_link"/>
3737
<child link="${prefix}robotiq_85_left_knuckle_link"/>
3838
<axis xyz="0 0 1"/>
@@ -46,7 +46,7 @@
4646
<axis xyz="0 0 1"/>
4747
<origin rpy="0.0 0.0 0.0" xyz="0.05490451627 -0.03060114443 0.0"/>
4848
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="1000"/>
49-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint"/>
49+
<mimic joint="${prefix}finger_joint"/>
5050
</joint>
5151

5252
<link name="${prefix}robotiq_85_left_knuckle_link">
@@ -147,7 +147,7 @@
147147
<axis xyz="0 0 1"/>
148148
<origin xyz="0.06142 0.0127 0" rpy="${pi} 0.0 0.0" />
149149
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="0.1"/>
150-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" offset="0"/>
150+
<mimic joint="${prefix}finger_joint" offset="0"/>
151151
</joint>
152152

153153
<joint name="${prefix}robotiq_85_right_inner_knuckle_joint" type="continuous">
@@ -156,7 +156,7 @@
156156
<axis xyz="0 0 1"/>
157157
<origin xyz="0.06142 -0.0127 0" rpy="0 0 0"/>
158158
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="0.1"/>
159-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" offset="0"/>
159+
<mimic joint="${prefix}finger_joint" offset="0"/>
160160
</joint>
161161

162162
<link name="${prefix}robotiq_85_left_inner_knuckle_link">
@@ -204,7 +204,7 @@
204204
<axis xyz="0 0 1"/>
205205
<origin xyz="0.04303959807 -0.03759940821 0.0" rpy="0.0 0.0 0.0"/>
206206
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="0.1"/>
207-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" multiplier="-1"/>
207+
<mimic joint="${prefix}finger_joint" multiplier="-1"/>
208208
</joint>
209209

210210
<joint name="${prefix}robotiq_85_right_finger_tip_joint" type="continuous">
@@ -213,7 +213,7 @@
213213
<axis xyz="0 0 1"/>
214214
<origin rpy="0.0 0.0 0.0" xyz="0.04303959807 -0.03759940821 0.0"/>
215215
<limit lower="-3.14" upper="3.14" velocity="100.0" effort="0.1"/>
216-
<mimic joint="${prefix}robotiq_85_left_knuckle_joint" multiplier="-1"/>
216+
<mimic joint="${prefix}finger_joint" multiplier="-1"/>
217217
</joint>
218218

219219

robotiq_gazebo/scripts/cmodel_controller_emulator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def cb_gripper_command(self, msg):
5454

5555
def cb_joint_states(self, msg):
5656
for joint_name in msg.name:
57-
if joint_name == 'robotiq_85_left_knuckle_joint':
57+
if joint_name == 'finger_joint':
5858
idx = msg.name.index(joint_name)
5959
self.position = msg.position[idx]
6060
break

0 commit comments

Comments
 (0)