Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HERB ros_control migration #63

Merged
merged 18 commits into from
May 12, 2016
Merged

HERB ros_control migration #63

merged 18 commits into from
May 12, 2016

Conversation

ClintLiddick
Copy link
Member

@mkoval minimal changes to match the update to prpy

@ClintLiddick ClintLiddick changed the title change params to WAM subclass ros_control backport May 9, 2016
@ClintLiddick
Copy link
Member Author

Ready for review. Need to decide if there's anything we want to merge first before tagging the final OWD version.

@mkoval mkoval changed the title ros_control backport HERB ros_control migration May 10, 2016
@@ -121,3 +122,6 @@ def FindIK(self, target):
ik_params = openravepy.IkParameterization(target, openravepy.IkParameterization.Type.Lookat3D)
return self.ikmodel.manip.FindIKSolution(ik_params, 0)

def GetDofValues(self):
"""Temp override to return static position while head is immobilized"""
return [0, -0.3]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Print a warning in here or mark this function as @deprecated.

@mkoval
Copy link
Member

mkoval commented May 10, 2016

We need to merge this pull request simultaneously with personalrobotics/prpy#233 and personalrobotics/herb_description#25.

# This is because we are overriding the force/torque sensor datatype
# sensor_data = hand.handstate_sensor.GetSensorData()
# return sensor_data.force.copy()
raise NotImplementedError("Strain guage not yet implemented in Python under ros_control")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: strain guage

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, delete dead code.

@param **kw_args planner parameters
@return felt_force flag indicating whether we felt a force.
"""
raise NotImplementedError('MoveUntilTouch not yet implemented under ros_control.')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only disable when not simulated.

@mkoval
Copy link
Member

mkoval commented May 12, 2016

Travis seems to be caching an old version of repositories.yml and, thus, failing to install all of HerbPy's dependencies.

I ran the unit tests locally and found that all of the unit tests fail. There appear to be some pretty major API breaks on the BarrettHand class, amongst some other issues. They also print this error message and hang indefinitely upon exit:

terminate called after throwing an instance of 'boost::exception_detail::clone_impl<boost::exception_detail::error_info_injector<boost::lock_error> >'
  what():  boost: mutex lock failed in pthread_mutex_lock: Invalid argument

@ClintLiddick Could you investigate?

@ClintLiddick
Copy link
Member Author

Oh fun. I'll check it out in the morning. Most of the methods now just
throw so I guess those tests just need to be disabled for now.
On May 11, 2016 22:06, "Michael Koval" [email protected] wrote:

Travis seems to be caching an old version of repositories.yml and, thus,
failing to install all of HerbPy's dependencies.

I ran the unit tests locally and found that all of the unit tests fail.
There appear to be some pretty major API breaks on the BarrettHand class,
amongst some other issues. They also print this error message and hang
indefinitely upon exit:

terminate called after throwing an instance of 'boost::exception_detail::clone_implboost::exception_detail::error_info_injector<boost::lock_error >'
what(): boost: mutex lock failed in pthread_mutex_lock: Invalid argument

@ClintLiddick https://github.com/ClintLiddick Could you investigate?


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#63 (comment)

@mkoval
Copy link
Member

mkoval commented May 12, 2016

There appears to be a transient Apt problem on Travis. I ran the tests locally and they passed.

@mkoval mkoval merged commit 4cd30ba into master May 12, 2016
@mkoval mkoval deleted the feature/ros_control branch May 12, 2016 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants