Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def askForCommand(command):

strAskForCommand += '-->'

return raw_input(strAskForCommand)
return input(strAskForCommand)

def publisher():
"""Main loop which requests new commands and publish them on the Robotiq2FGripperRobotOutput topic."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def askForCommand(command):

strAskForCommand += '-->'

return raw_input(strAskForCommand)
return input(strAskForCommand)


def publisher():
Expand Down
Binary file not shown.
Binary file modified robotiq_ft_sensor/meshes/collision/robotiq_ft300.STL
Binary file not shown.
2 changes: 1 addition & 1 deletion robotiq_ft_sensor/urdf/robotiq_ft300.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</link>

<!-- Connect force sensor with mounting/coupling plate -->
<joint name="${prefix}ft300_mounting_plate" type="fixed">
<joint name="${prefix}ft300_mounting_plate_joint" type="fixed">
<origin xyz="0 0 0.0415" rpy="0 ${pi} 0"/>
<parent link="${prefix}ft300_mounting_plate" />
<child link="${prefix}ft300_sensor" />
Expand Down
2 changes: 1 addition & 1 deletion robotiq_modbus_tcp/src/robotiq_modbus_tcp/comModbusTcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def sendCommand(self, data):
message = []

#Fill message by combining two bytes in one register
for i in range(0, len(data)/2):
for i in range(0, int(len(data)/2)):
message.append((data[2*i] << 8) + data[2*i+1])

#To do!: Implement try/except
Expand Down