Skip to content

Commit

Permalink
Merge pull request #254 from Stefanos19/master
Browse files Browse the repository at this point in the history
Workaround for CloseFingers on MicoHand.
  • Loading branch information
mkoval committed Feb 3, 2016
2 parents 0496943 + 926ed08 commit 12d352a
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions src/prpy/base/micohand.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,7 @@ def CloseHand(self, value=0.8, timeout=None):
""" Close the hand.
@param timeout blocking execution timeout
"""
if self.simulated:
robot = self.manipulator.GetRobot()
p = openravepy.KinBody.SaveParameters

with robot.CreateRobotStateSaver(p.ActiveDOF | p.ActiveManipulator):
self.manipulator.SetActive()
robot.task_manipulation.CloseFingers()

if timeout:
robot.WaitForController(timeout)

return None
else:
return self.MoveHand(f1=value, f2=value, timeout=timeout)
return self.MoveHand(f1=value, f2=value, timeout=timeout)

def CloseHandTight(self, value=1.2, timeout=None):
""" Close the hand tightly.
Expand Down

0 comments on commit 12d352a

Please sign in to comment.