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

Enhancement/ports moveit 3522 (backport #3070) #3075

Open
wants to merge 1 commit into
base: iron
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 8, 2024

Description

Ports moveit/moveit#3522 to moveit2. Should fix #2857

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference (fixes bug)
  • Document API changes relevant to the user in the MIGRATION.md notes (fixes bug)
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI (No GUI changes)
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #3070 done by [Mergify](https://mergify.com).

* Makes PTP changes

* Makes LIN changes

* Makes CIRC changes

* Makes CIRC changes

* Makes CIRC changes

* Makes CIRC changes

* Makes LIN changes

* Makes LIN changes

* Fixes formatting

* Replace ROS_WARN with RCLCPP_WARN

* Fixes formatting

* Fixes RCLCPP_WARN calls

* Fixes compiler errors

* Fixes if statement

* Fixes formatting

* Fixes msg type

(cherry picked from commit 4c28a74)

# Conflicts:
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_circ.cpp
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_lin.cpp
@mergify mergify bot added the conflicts label Nov 8, 2024
Copy link
Author

mergify bot commented Nov 8, 2024

Cherry-pick of 4c28a74 has failed:

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

You are currently cherry-picking commit 4c28a7434.
  (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_planners/pilz_industrial_motion_planner/src/trajectory_generator_ptp.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_circ.cpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_lin.cpp

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant