Skip to content

[backport] Pilz planner merge#2507

Merged
v4hn merged 2 commits intomoveit:melodic-develfrom
PilzDE:pilz_planner_merge_backport
Mar 2, 2021
Merged

[backport] Pilz planner merge#2507
v4hn merged 2 commits intomoveit:melodic-develfrom
PilzDE:pilz_planner_merge_backport

Conversation

@martiniil
Copy link
Copy Markdown
Contributor

@martiniil martiniil commented Feb 3, 2021

Description

Melodic backport adding the pilz_industrial_motion_planner (#1893)

Tutorial: moveit/moveit_tutorials#583

Checklist

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

ct2034 and others added 2 commits February 3, 2021 13:41
* Add pilz_industrial_motion_planner to moveit_planners
* Update license, document consent to this change by contributers
* Fix formatting, code style, catkin_lint, clang-tidy
* Add and update tests, use new prvt_moveit_config from moveit_resources
* New codeowners for pilz_industrial_motion planner
* Add pipeline configuration teimplates to MSA

Co-authored-by: Joachim Schleicher <J.Schleicher@pilz.de>
Co-authored-by: rfeistenauer <r.feistenauer@pilz.de>
Co-authored-by: Giuseppe Sansone <g.sansone@pilz.de>
Co-authored-by: Immanuel Martini <i.martini@pilz.de>
@martiniil martiniil changed the title Pilz planner merge backport [backport] Pilz planner merge Feb 3, 2021
@martiniil martiniil marked this pull request as ready for review February 3, 2021 14:05
@codecov
Copy link
Copy Markdown

codecov bot commented Feb 3, 2021

Codecov Report

Merging #2507 (912fdb3) into melodic-devel (1e6fd14) will increase coverage by 4.47%.
The diff coverage is 99.62%.

Impacted file tree graph

@@                Coverage Diff                @@
##           melodic-devel    #2507      +/-   ##
=================================================
+ Coverage          51.28%   55.74%   +4.47%     
=================================================
  Files                323      401      +78     
  Lines              23307    25343    +2036     
=================================================
+ Hits               11951    14126    +2175     
+ Misses             11356    11217     -139     
Impacted Files Coverage Δ
...pilz_industrial_motion_planner_testutils/basecmd.h 100.00% <ø> (ø)
..._motion_planner_testutils/cartesianconfiguration.h 50.00% <ø> (ø)
...lanner_testutils/cartesianpathconstraintsbuilder.h 100.00% <ø> (ø)
.../pilz_industrial_motion_planner_testutils/center.h 100.00% <ø> (ø)
...de/pilz_industrial_motion_planner_testutils/circ.h 100.00% <ø> (ø)
...ndustrial_motion_planner_testutils/circauxiliary.h 100.00% <ø> (ø)
...ustrial_motion_planner_testutils/exception_types.h 0.00% <ø> (ø)
..._planner_testutils/goalconstraintsmsgconvertible.h 100.00% <ø> (ø)
...pilz_industrial_motion_planner_testutils/gripper.h 100.00% <ø> (ø)
...pilz_industrial_motion_planner_testutils/interim.h 100.00% <ø> (ø)
... and 172 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1e6fd14...b84bc59. Read the comment docs.

Copy link
Copy Markdown
Contributor

@jschleicher jschleicher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This cherry-pick brings the pilz_industrial_motion_planner to melodic.

@jschleicher jschleicher added awaits 2nd review one maintainer approved this request backport porting back changes from more current branches labels Feb 19, 2021
@v4hn
Copy link
Copy Markdown
Contributor

v4hn commented Mar 2, 2021

I'm puzzled about this not being merged after weeks. This was previously reviewed, passes CI and only adds functionality without touching anything else.
Merging.

@v4hn v4hn merged commit 45e2be9 into moveit:melodic-devel Mar 2, 2021
@martiniil martiniil deleted the pilz_planner_merge_backport branch March 2, 2021 09:46
Comment on lines +50 to +51
<param name="capabilities" value="$(arg capabilities)"/>
<param name="disable_capabilities" value="$(arg disable_capabilities)"/>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just ran into a problem with roslaunch complaining that param is unexpected here in an include. And it's correct.

Should this be arg instead? Seems this is a problem on Melodic, which doesn't have #2127, which corrected this.

Copy link
Copy Markdown
Member

@gavanderhoorn gavanderhoorn Jun 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1893 introduced this in master (here), but that got overwritten by #2127 (here).

All MoveIt configuration packages generated by the MSA on Melodic seem to be broken by this.

As Noetic basically gets master, it's not a problem there.

Copy link
Copy Markdown
Member

@gavanderhoorn gavanderhoorn Jun 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An issue has better visibility: #2728.

gavanderhoorn added a commit that referenced this pull request Jun 22, 2021
These two lines were moved here (from the `move_group` node section below) in #2507 as part of the Melodic backport of the Pilz planner, but were not changed to `arg`s.

`include` elements do not support `param` children.

Change these to `arg`s to make `roslaunch` pass them on to `planning_pipeline.launch.xml` as intended.

Note: this is not a problem on `master` (and consequently `noetic-devel`), as #2127 rearranged things again (to move capabilities management to the per-pipeline launch files) and fixed it.
v4hn pushed a commit that referenced this pull request Jun 22, 2021
These two lines were moved here (from the `move_group` node section below) in #2507 as part of the Melodic backport of the Pilz planner, but were not changed to `arg`s.

`include` elements do not support `param` children.

Change these to `arg`s to make `roslaunch` pass them on to `planning_pipeline.launch.xml` as intended.

Note: this is not a problem on `master` (and consequently `noetic-devel`), as #2127 rearranged things again (to move capabilities management to the per-pipeline launch files) and fixed it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaits 2nd review one maintainer approved this request backport porting back changes from more current branches

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants