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

Restructure moveit config #567

Merged
merged 2 commits into from
Jan 11, 2017

Conversation

fmessmer
Copy link
Member

@fmessmer fmessmer commented Dec 13, 2016

replaces #518
requires ipa320/cob_manipulation#88

We will keep the moveit_config files separate from cob_hardware_config files in a dedicated cob_moveit_config package including only config files (no moveit launch files) for easier maintainability.
However, we could move (with history) cob_moveit_config from cob_manipulation into cob_robots in order to have all configuration at one place.

We will deal with debugging the functionality of the collision_monitor later, i.e. investigate why wrong collisions are reported and fix model as well as SRDFs...related issue is ipa320/cob_manipulation#89

@fmessmer
Copy link
Member Author

fmessmer commented Dec 13, 2016

@ipa-mdl @ipa-nhg please review/comment

I think we should squash/rebase/cherry-pick this PR after review...

@fmessmer fmessmer force-pushed the restructure_moveit_config branch from 773bea4 to 58c39d5 Compare December 14, 2016 10:15
@fmessmer fmessmer force-pushed the restructure_moveit_config branch from 58c39d5 to 365f8a9 Compare December 14, 2016 10:16
@fmessmer
Copy link
Member Author

commit log has been cleaned up (proper rebase and extraction of cob4-10 fixes into separate PR #570)

@@ -1,13 +1,10 @@
<?xml version="1.0"?>
<launch>

<arg name="robot" default="$(optenv ROBOT !!NO_ROBOT_SET!!)"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

spaces >> tabs ;)

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm reverting it to how it has always been before I left 😉
We used to use tabs in all our launch files....

Copy link
Contributor

Choose a reason for hiding this comment

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

Tabs are really annoying..
(my default editor does not handle them properly :-/)

@fmessmer fmessmer merged commit b081cb4 into ipa320:indigo_dev Jan 11, 2017
@fmessmer fmessmer deleted the restructure_moveit_config branch January 11, 2017 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants