Skip to content

Ports moveit/moveit/pull/3519 to ros2 (backport #3055)#3061

Merged
sjahr merged 2 commits intohumblefrom
mergify/bp/humble/pr-3055
Nov 8, 2024
Merged

Ports moveit/moveit/pull/3519 to ros2 (backport #3055)#3061
sjahr merged 2 commits intohumblefrom
mergify/bp/humble/pr-3055

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Nov 5, 2024

Description

Ports moveit/moveit#3519 to ROS2. This may partially fix #2857 for the LIN planner

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference (Backend pilz changes only)
  • Document API changes relevant to the user in the MIGRATION.md notes (Backend pilz changes only)
  • Create tests, which fail without this PR reference (Modified existing tests to use modified code)
  • 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 #3055 done by [Mergify](https://mergify.com).

@riv-tnoble @mergify
Ports moveit/moveit/pull/3519 to ros2 (#3055)
bc9067e 
* Ports moveit/moveit/pull/3519 to ros2

* Applies formatting

* Fixes compilation errors

* Fixes compilation errors

* Fixes compilation errors

* Fixes compilation errors

* Replaces RobotState with pointer in tests

* Fixes tests

(cherry picked from commit 70e1aae)

# Conflicts:
#	moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/planning_context_base.h
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_functions.cpp
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator.cpp
#	moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_circ.cpp
#	moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_lin.cpp
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Nov 5, 2024

Cherry-pick of 70e1aae has failed:

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

You are currently cherry-picking commit 70e1aae8b.
  (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/include/pilz_industrial_motion_planner/trajectory_functions.h
	modified:   moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/trajectory_generator.h
	modified:   moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/trajectory_generator_circ.h
	modified:   moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/trajectory_generator_lin.h
	modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_blender_transition_window.cpp
	modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_circ.cpp
	modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_lin.cpp
	modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator_ptp.cpp
	modified:   moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_functions.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/planning_context_base.h
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_functions.cpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_generator.cpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_circ.cpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_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

@mergify mergify bot added the conflicts label Nov 5, 2024
@riv-tnoble
Fixes merge conflicts (backport humble 3055) (#3066)
5d8ebbd 
* Fixes merge conflicts

* Fixes formatting
@riv-tnoble
Copy link
Copy Markdown
Contributor

riv-tnoble commented Nov 8, 2024

@sjahr Would it be alright to merge this PR into humble?

@sjahr sjahr merged commit ad0431b into humble Nov 8, 2024
@sjahr sjahr deleted the mergify/bp/humble/pr-3055 branch November 8, 2024 11:50
@TSNoble TSNoble mentioned this pull request Nov 10, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sjahr sjahr sjahr approved these changes

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@riv-tnoble @sjahr