Skip to content

Reopen #85: Add capability to execute trajectory with a ROS action#94

Merged
davetcoleman merged 4 commits intomoveit:kinetic-develfrom
rhaschke:execute-action
Aug 23, 2016
Merged

Reopen #85: Add capability to execute trajectory with a ROS action#94
davetcoleman merged 4 commits intomoveit:kinetic-develfrom
rhaschke:execute-action

Conversation

@rhaschke
Copy link
Copy Markdown
Contributor

This reopens #85/#60 against kinetic. As proposed in moveit/moveit_msgs#27 (comment), I suggest to drop that new feature for Indigo, because we require user intervention to switch moveit_config's launch files to the new capability.

Additional to @wkentaro great work (from #85), I cleaned up the waiting for required action servers and services to allow to issue the deprecation warning once on startup.

- unified names of execute_trajectory service and action capabilities
- consider overall (wall) timeout for waiting for action servers
- output deprecation warning once during instantiation
@wkentaro
Copy link
Copy Markdown
Contributor

@rhaschke Thanks! The code looks good to me.

const ros::Duration &wait_for_server = ros::Duration(0, 0));
const ros::WallDuration &wait_for_servers = ros::WallDuration());
ROS_DEPRECATED MoveGroup(const Options &opt, const boost::shared_ptr<tf::Transformer> &tf = boost::shared_ptr<tf::Transformer>(),
const ros::Duration &wait_for_servers = ros::Duration());
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

- use MOVEIT_DEPRECATED instead of ROS_DEPRECATED
- use separated function waitForExecuteActionOrService()
@davetcoleman
Copy link
Copy Markdown
Member

+1, does @v4hn want to look at this?

@v4hn
Copy link
Copy Markdown
Contributor

v4hn commented Aug 23, 2016 via email

@davetcoleman davetcoleman merged commit 0d470d6 into moveit:kinetic-devel Aug 23, 2016
davetcoleman pushed a commit that referenced this pull request Aug 23, 2016
* Add capability to execute trajectory as a ROS action

* cleanup instantiation of MoveGroupInterface

- unified names of execute_trajectory service and action capabilities
- consider overall (wall) timeout for waiting for action servers
- output deprecation warning once during instantiation

* addressed Dave's comments

- use MOVEIT_DEPRECATED instead of ROS_DEPRECATED
- use separated function waitForExecuteActionOrService()

* reduced sleeps to 0.001s again
@davetcoleman
Copy link
Copy Markdown
Member

cherry-picked to J, not I

@wkentaro
Copy link
Copy Markdown
Contributor

@davetcoleman
Oops, you squashed the commits of mine and @rhaschke . And my own commit has gone.
Actually, I'm working as a Google Summer of Code student, and I need to report my commits that are merged. So I hope it would be non-squashed commits.
Could u please fix this?

@davetcoleman
Copy link
Copy Markdown
Member

davetcoleman commented Aug 24, 2016

@wkentaro I'm really sorry, I didn't think about that. I checked the 4 commits and they were messy / not feature-grouped:

Add capability to execute trajectory as a ROS action
cleanup instantiation of MoveGroupInterface …
addressed Dave's comments …
reduced sleeps to 0.001s again

so did my standard squash-merge without thinking about attribution. I'm not sure there is an easy way to fix this other than reverting this change with a commit, then re-committing on top of that with a commit with your name on it. We'd have to do this twice for both branches. Is there any way you can still show to GSoC that this was in fact your work?

@wkentaro
Copy link
Copy Markdown
Contributor

so did my standard squash-merge without thinking about attribution. I'm not sure there is an easy way to fix this other than reverting this change with a commit, then re-committing on top of that with a commit with your name on it. We'd have to do this twice for both branches. Is there any way you can still show to GSoC that this was in fact your work?

I'm not sure how the GSoC admins evaluate the my final submission, because they don't say about it in the final evaluation instruction.
(If they read all PRs carefully, as well as this comment, it would be fine.)
I'll refer this PR as one of my works, and I hope they don't evaluate only with the number of commits whose author is me.

@davetcoleman
Copy link
Copy Markdown
Member

I did GSoC two years ago! From my experience I think you'll be fine

@wkentaro
Copy link
Copy Markdown
Contributor

I see. That's fine then!

2016年8月25日木曜日、Dave Colemannotifications@github.comさんは書きました:

I did GSoC two years ago! From my experience I think you'll be fine


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#94 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AEHFk9Vn116VYqzBl4NWJ7X3qkBLppQdks5qjTprgaJpZM4JpGvb
.

和田 健太郎 / Kentaro Wada
http://wkentaro.com

rhaschke added a commit that referenced this pull request Aug 26, 2016
v4hn added a commit that referenced this pull request Nov 11, 2016
cherry-pick #94 from kinetic-devel: execute action capability
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.

4 participants