Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

(hironx_client.py) Fix https://github.com/start-jsk/rtmros_hironx/issues/45 #51

Merged
merged 1 commit into from

2 participants

@130s
Owner

No description provided.

@k-okada
Owner

restart travis to see if what's happens, last time, hrspys-simulator crashes

@130s
Owner
@130s
Owner

Well hrpsys-simulator runs without any problems from source with this commit.

@130s
Owner
@k-okada
Owner

3.1.5-8 did not includes .so files under opt/ros/hydro/lib so that may the reason of crashing.

@130s
Owner

Functionality is confirmed in #52 on simulator.

@130s
Owner

The commit updated. Guessing travis will be retriggered soon?

@130s 130s merged commit a53a289 into start-jsk:groovy-devel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 7, 2014
This page is out of date. Refresh to see the latest.
View
2  hironx_ros_bridge/package.xml
@@ -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> -->
View
7 hironx_ros_bridge/src/hironx_ros_bridge/hironx_client.py
@@ -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
@@ -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):
Something went wrong with that request. Please try again.