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

Backport of Pilz examples and update to ROS2 (#548) to humble #797

Merged
merged 2 commits into from
Oct 24, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 23, 2023

This is an automatic backport of pull request #548 done by Mergify.
Cherry-pick of 7498cc2 has failed:

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

You are currently cherry-picking commit 7498cc2.
  (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:   doc/examples/pilz_industrial_motion_planner/CMakeLists.txt
	new file:   doc/examples/pilz_industrial_motion_planner/launch/pilz_mtc.launch.py
	modified:   doc/examples/pilz_industrial_motion_planner/pilz_industrial_motion_planner.rst
	modified:   doc/examples/pilz_industrial_motion_planner/rviz_planner.png
	new file:   doc/examples/pilz_industrial_motion_planner/src/pilz_move_group.cpp
	new file:   doc/examples/pilz_industrial_motion_planner/src/pilz_mtc.cpp

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

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

* Add bare-bones Pilz code examples

* Fill in Pilz MTC example

* Clean up MTC example

* Fill in MoveGroup Interface example + more cleanup

* Update docs

* clang-format

* Fix HTML targets

* Update code links to use codedir

* PR comments

* Fix URL

(cherry picked from commit 7498cc2)

# Conflicts:
#	CMakeLists.txt
@mergify mergify bot added conflicts humble Humble branch labels Oct 23, 2023
@sea-bass sea-bass linked an issue Oct 23, 2023 that may be closed by this pull request
@sea-bass sea-bass self-assigned this Oct 23, 2023
@sjahr sjahr merged commit e9c7525 into humble Oct 24, 2023
@sjahr sjahr deleted the mergify/bp/humble/pr-548 branch October 24, 2023 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Humble branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

file 'pilz_mtc.launch.py' was not found
2 participants