Skip to content

Commit

Permalink
(hironx_ros_bridge) Fix #45 Add versioned build_dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
Isaac Isao Saito committed Mar 7, 2014
1 parent f5febe8 commit 4b576ad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions hironx_ros_bridge/package.xml
Expand Up @@ -15,9 +15,11 @@

<buildtool_depend>catkin</buildtool_depend>

<build_depend version_gte="315.1.8">hrpsys</build_depend> <!-- See https://github.com/tork-a/rtmros_nextage/issues/51. Even though hrpsys is transitively depended via hrpsys_ros_bridge, still define it here explicitly to clarify, especially the version dependency. -->
<build_depend>hrpsys_ros_bridge</build_depend> <!-- Needed to transitively depend on openhrp3. See https://github.com/start-jsk/rtmros_hironx/pull/30#commitcomment-5535604 -->
<build_depend>unzip</build_depend>

<run_depend version_gte="315.1.8">hrpsys</run_depend> <!-- See https://github.com/tork-a/rtmros_nextage/issues/51 -->
<run_depend>hrpsys_ros_bridge</run_depend>

<!-- <test_depend>hrpsys_ros_bridge</test_depend> -->
Expand Down
7 changes: 5 additions & 2 deletions hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
Expand Up @@ -839,7 +839,7 @@ class level. Please consider opening an enhancement ticket for that
return HrpsysConfigurator.setJointAnglesOfGroup(self, gname, pose, tm,
wait)

def setTargetPose(self, gname, pos, rpy, tm):
def setTargetPose(self, gname, pos, rpy, tm, ref_frame_name=None):
'''
@see: HrpsysConfigurator.setTargetPose
Expand All @@ -850,8 +850,11 @@ def setTargetPose(self, gname, pos, rpy, tm):
@type pos: float
@type rpy: TODO: ??
@rtype: bool
@type ref_frame_name: str
@param ref_frame_name: Name of the frame that this particular command
reference to.
'''
return HrpsysConfigurator.setTargetPose(self, gname, pos, rpy, tm)
return HrpsysConfigurator.setTargetPose(self, gname, pos, rpy, tm, ref_frame_name)

def setTargetPoseRelative(self, gname, eename, dx=0, dy=0, dz=0,
dr=0, dp=0, dw=0, tm=10, wait=True):
Expand Down

0 comments on commit 4b576ad

Please sign in to comment.