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

(moveit_py) Add Trajectory Execution Manager (backport #2406) #2522

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 10, 2023

This is an automatic backport of pull request #2406 done by Mergify.
Cherry-pick of 76a488b has failed:

On branch mergify/bp/iron/pr-2406
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 76a488b54.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   moveit_py/CMakeLists.txt
	modified:   moveit_py/moveit/core/controller_manager.pyi
	modified:   moveit_py/moveit/planning.pyi
	modified:   moveit_py/src/moveit/moveit_core/controller_manager/controller_manager.cpp
	modified:   moveit_py/src/moveit/moveit_ros/moveit_cpp/moveit_cpp.cpp
	new file:   moveit_py/src/moveit/moveit_ros/trajectory_execution_manager/trajectory_execution_manager.cpp
	new file:   moveit_py/src/moveit/moveit_ros/trajectory_execution_manager/trajectory_execution_manager.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_py/src/moveit/planning.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* (moveit_py) add trajectory execution manager

* (moveit_py) add __bool__ to ExecutionStatus

* (moveit_py) Update copyright header of changed files

* (moveit_py) add comment referencing issue

* Rename init_trajectory_execution_manager -> initTrajectoryExecutionManager

* (moveit_py) python functions snake_case

* (moveit_py) fix styling

---------

(cherry picked from commit 76a488b)

# Conflicts:
#	moveit_py/src/moveit/planning.cpp
@mergify mergify bot added the conflicts label Nov 10, 2023
Copy link

This PR is stale because it has been open for 45 days with no activity. Please tag a maintainer for help on completing this PR, or close it if you think it has become obsolete.

@github-actions github-actions bot added the stale Inactive issues and PRs are marked as stale and may be closed automatically. label Dec 26, 2023
@sea-bass sea-bass closed this Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts stale Inactive issues and PRs are marked as stale and may be closed automatically.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants