Skip to content

Backport of Add tutorial for How to Use OMPL Constrained Planning (#386) to humble#476

Merged
stephanie-eng merged 1 commit intohumblefrom
mergify/bp/humble/pr-386
May 12, 2023
Merged

Backport of Add tutorial for How to Use OMPL Constrained Planning (#386) to humble#476
stephanie-eng merged 1 commit intohumblefrom
mergify/bp/humble/pr-386

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Jul 22, 2022

This is an automatic backport of pull request #386 done by Mergify.
Cherry-pick of 2db5773 has failed:

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

You are currently cherry-picking commit 2db5773.
  (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:
	new file:   _static/videos/ompl_constraints_box.webm
	new file:   _static/videos/ompl_constraints_line.webm
	new file:   _static/videos/ompl_constraints_orientation.webm
	new file:   _static/videos/ompl_constraints_plane.webm
	modified:   doc/examples/examples.rst
	deleted:    doc/examples/ompl_constrained_planning/CMakeLists.txt
	deleted:    doc/examples/ompl_constrained_planning/ompl_constrained_planning.rst
	deleted:    doc/examples/ompl_constrained_planning/rviz_add_marker_topic.png
	deleted:    doc/examples/ompl_constrained_planning/scripts/extra_examples.py
	deleted:    doc/examples/ompl_constrained_planning/scripts/ompl_constrained_planning_tutorial.py
	modified:   doc/how_to_guides/how_to_guides.rst
	new file:   doc/how_to_guides/using_ompl_constrained_planning/CMakeLists.txt
	new file:   doc/how_to_guides/using_ompl_constrained_planning/RVizVisualTools.png
	renamed:    doc/examples/ompl_constrained_planning/case_1.gif -> doc/how_to_guides/using_ompl_constrained_planning/case_1.gif
	renamed:    doc/examples/ompl_constrained_planning/case_2.gif -> doc/how_to_guides/using_ompl_constrained_planning/case_2.gif
	renamed:    doc/examples/ompl_constrained_planning/case_3.gif -> doc/how_to_guides/using_ompl_constrained_planning/case_3.gif
	new file:   doc/how_to_guides/using_ompl_constrained_planning/config/ompl_planning.yaml
	new file:   doc/how_to_guides/using_ompl_constrained_planning/launch/ompl_constrained_planning.launch.py
	new file:   doc/how_to_guides/using_ompl_constrained_planning/launch/ompl_constrained_planning.rviz
	new file:   doc/how_to_guides/using_ompl_constrained_planning/ompl_constrained_planning.rst
	renamed:    doc/examples/ompl_constrained_planning/ompl_constrained_planning_header.png -> doc/how_to_guides/using_ompl_constrained_planning/ompl_constrained_planning_header.png
	new file:   doc/how_to_guides/using_ompl_constrained_planning/src/ompl_constrained_planning_tutorial.cpp
	renamed:    doc/examples/ompl_constrained_planning/trajectory_slider.png -> doc/how_to_guides/using_ompl_constrained_planning/trajectory_slider.png

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/upstream.repos
	both modified:   CMakeLists.txt
	both modified:   moveit2_tutorials.repos

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

@mergify mergify bot added conflicts humble Humble branch labels Jul 22, 2022
@tylerjw tylerjw mentioned this pull request Jul 22, 2022
Closed
@mergify
Copy link
Copy Markdown
Author

mergify bot commented May 10, 2023

This pull request is in conflict. Could you fix it @mergify[bot]?

@stephanie-eng stephanie-eng self-assigned this May 11, 2023
@stephanie-eng stephanie-eng force-pushed the mergify/bp/humble/pr-386 branch 4 times, most recently from 0116fed to fbf8607 Compare May 12, 2023 14:59
@stephanie-eng
Add tutorial for How to Use OMPL Constrained Planning (#386)
225a064 
* Add tutorial for How to Use OMPL Constrained Planning

* Reorganize code, port comments from original, use equality constraints

* Update tutorial text and media, reorganize files, and clean up

* Update .repos file for RViz Visual Tools

* Remove outdated video link

* Add description and links for projection evaluator

Co-authored-by: AndyZe <zelenak@picknik.ai>
(cherry picked from commit 2db5773)
@stephanie-eng stephanie-eng force-pushed the mergify/bp/humble/pr-386 branch from fbf8607 to 225a064 Compare May 12, 2023 15:09
@stephanie-eng stephanie-eng merged commit 7c15630 into humble May 12, 2023
@stephanie-eng stephanie-eng deleted the mergify/bp/humble/pr-386 branch May 12, 2023 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stephanie-eng stephanie-eng stephanie-eng approved these changes

Assignees

@stephanie-eng stephanie-eng

Labels

humble Humble branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@stephanie-eng