Skip to content

Commit

Permalink
Merge pull request #53 from Hiroaki-Masuzawa/fix_wait
Browse files Browse the repository at this point in the history
参照できない変数の修正
  • Loading branch information
YoheiKakiuchi authored Apr 30, 2024
2 parents db74e1b + 58704b5 commit 3049cce
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions irsl_choreonoid_ros/RobotInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ def sendAngleVectorSequence(self, angle_vector_list, tm_list, group=None, wait=F
if wait:
self.waitUntilFinish(group=group, timeout=waitTimeout)

def sendAngleMap(self, angle_map, tm, group=None):
def sendAngleMap(self, angle_map, tm, group=None, wait=False, waitTimeout=None):
"""Sending angles to the actual robot. angles is set to self.robot
Args:
Expand Down Expand Up @@ -403,7 +403,7 @@ def setJointNames(self, names):
for j in self.joint_names:
j = self._robot.joint(j)
if j is None:
print('JointGroupTopic({}): joint-name: {} is invalid'.format(name, j))
print('JointGroupTopic({}): joint-name: {} is invalid'.format(self.name, j))
else:
self.joints.append(j)

Expand Down Expand Up @@ -1184,7 +1184,7 @@ def sendCommand(self, position, max_effort=10.0):
self._client.send_goal(goal_)

def isFinished(self): ## override
return _client.simple_state != actionlib.SimpleGoalState.ACTIVE
return self._client.simple_state != actionlib.SimpleGoalState.ACTIVE

def waitUntilFinish(self, timeout=None): ## override
if timeout is None:
Expand Down

0 comments on commit 3049cce

Please sign in to comment.