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

Sync with MoveIt #834

Merged
merged 15 commits into from
Nov 30, 2021
Merged

Sync with MoveIt #834

merged 15 commits into from
Nov 30, 2021

Conversation

Abishalini
Copy link
Contributor

Description

Synced the following commits from MoveIt

* [2021-08-26] [865c26112] | MSA: Mention optional Gazebo deps in package.xml templates (#2839) {{Rick Staa}} 
* [2021-08-26] [eb6135bab] | Consider attached bodies in Pilz planner #2773 (#2824) {{cambel}} 
* [2021-08-25] [bef8f7cdd] | Makes rviz trajectory visualization topic relative (#2835) {{Rick Staa}} 
* [2021-08-23] [7cea1f219] | MotionPlanningFrame: Gracefully handle undefined parent widget (#2833) {{Robert Haschke}} 
* [2021-08-22] [0d38983cc] | Bump version: 1.1.6 (#2832) {{Robert Haschke}} 
* [2021-08-20] [1859ec2d2] | Fix Bullet collision returning wrong contact type (#2829) {{Yuri Rocha}} 
* [2021-08-20] [f8f82810d] | Add RobotState::setToDefaultValues from group string (#2828) {{Michael Görner}} 
* [2021-08-20] [1d75d646f] | CI: Enable -Werror only for TARGET and DOWNSTREAM workspaces (#2821) {{Robert Haschke}} 
* [2021-08-19] [6012934e3] | CI: Update pat-s/always-upload-cache {{Vatan Aksoy Tezer}} 
* [2021-08-18] [7855e1ffb] | Fix Pilz planner's collision detection (#2803) {{aa-tom}} 
* [2021-08-18] [0e9844d30] | Fix issue #2809 (broken test with clang) (#2820) {{Robert Haschke}} 
* [2021-08-18] [6ab6d896b] | Remove python3-osrf-pycommon from Dockerfile (#2822) {{Martin Günther}} 
* [2021-08-17] [4d6f805b8] | [moveit_core] Fix export of FCL dependency (#2819) {{Jochen Sprickerhof}} 
* [2021-08-16] [6e798bf30] | code fix on wrong substitution (#2815) {{toru-kuga}} 

toru-kuga and others added 15 commits August 16, 2021 11:50
This was a workaround for catkin/catkin_tools#594,
which is no longer needed because python3-catkin-tools 0.7 added the required dependency.
Because std::make_pair uses the decayed type (std::string), the strings were actually copied into a temporary, which was subsequently referenced by the elements of std::pair, leading to a stack-use-after-scope error.
Explicitly passing const references into std::make_pair via std::cref() resolves the issue mentioned in #2809.
We need to pass the current PlanningScene down to the actual collision checking methods
* fix getting wrong type ID

* update unit test
…t#2833)

If the MP plugin was created in a non-rviz context (e.g. directly via librviz),
there might be no window manager and thus no parent widget available for panels.
This commit makes the trajectory visualization topic relative. This was
done to make sure that it respects the namespaces that are set in
launch files.

Co-authored-by: Felix von Drigalski <FvDrigalski@gmail.com>
Co-authored-by: Michael Görner <me@v4hn.de>
- Remove convertToRobotTrajectory() and integrate its line of code into setSuccessResponse()
- Pass the final start_state into setSuccessResponse()

Co-authored-by: Cristian Beltran <cristianbehe@gmail.com>
Co-authored-by: Robert Haschke <rhaschke@techfak.uni-bielefeld.de>
@JafarAbdi
Copy link
Member

This may cause conflicts with #452, not sure which one we want to merge first

Copy link
Member

@tylerjw tylerjw left a comment

Choose a reason for hiding this comment

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

This has a bunch of Pilz planner changes. @henningkayser should look over this to make sure these changes are in line with what he's changed in his Pilz port.

@codecov
Copy link

codecov bot commented Nov 29, 2021

Codecov Report

Merging #834 (77075f5) into main (97ebea3) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #834      +/-   ##
==========================================
- Coverage   56.68%   56.67%   -0.01%     
==========================================
  Files         200      200              
  Lines       21660    21660              
==========================================
- Hits        12276    12273       -3     
- Misses       9384     9387       +3     
Impacted Files Coverage Δ
...bot_state/include/moveit/robot_state/robot_state.h 89.82% <ø> (ø)
...detection_bullet/bullet_integration/bullet_utils.h 89.79% <100.00%> (ø)
...dl_kinematics_plugin/src/kdl_kinematics_plugin.cpp 74.82% <0.00%> (-1.11%) ⬇️

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 97ebea3...77075f5. Read the comment docs.

Copy link
Member

@henningkayser henningkayser left a comment

Choose a reason for hiding this comment

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

Thanks for preparing this! I reviewed the changes related to PILZ, and I think I'll just rebase that PR.

@henningkayser henningkayser merged commit 77075f5 into moveit:main Nov 30, 2021
@Abishalini Abishalini deleted the pr-sync-865c26112 branch November 30, 2021 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.