Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Port: Pr keep ref to scene valid #2745

Merged
merged 6 commits into from
Mar 28, 2024
Merged

Conversation

sjahr
Copy link
Contributor

@sjahr sjahr commented Mar 18, 2024

Description

Port moveit/moveit#3538 over from moveit1

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

v4hn added 2 commits March 18, 2024 10:46
plan_execution-related modules rely on `plan.planning_scene_` in many places
to point to the currently monitored scene (or a diff on top of it).

Before this patch, if the PSM would receive full scenes during execution,
`plan.planning_scene_` would not include later incremental updates anymore
because the monitor created a new diff scene.
@rhaschke
Copy link
Contributor

Unfortunately, CI is broken due to a broken rolling setup. Do the tests pass locally?

@sjahr
Copy link
Contributor Author

sjahr commented Mar 19, 2024

Unfortunately, CI is broken due to a broken rolling setup. Do the tests pass locally?

Yes, but CI wont do for a little longer :/ The rolling transition to Ubuntu 24.04 is blocking us here. The Humble CI failure is fixed by #2750

@sjahr sjahr merged commit 29c585a into moveit:main Mar 28, 2024
7 of 11 checks passed
rhaschke pushed a commit to rhaschke/moveit2 that referenced this pull request May 24, 2024
…it#2745)

plan_execution-related modules rely on `plan.planning_scene_` in many places
to point to the currently monitored scene (or a diff on top of it).

Before this patch, if the PSM would receive full scenes during execution,
`plan.planning_scene_` would not include later incremental updates anymore
because the monitor created a new diff scene.
---------

Co-authored-by: v4hn <me@v4hn.de>
rhaschke pushed a commit to rhaschke/moveit2 that referenced this pull request Aug 29, 2024
…it#2745)

plan_execution-related modules rely on `plan.planning_scene_` in many places
to point to the currently monitored scene (or a diff on top of it).

Before this patch, if the PSM would receive full scenes during execution,
`plan.planning_scene_` would not include later incremental updates anymore
because the monitor created a new diff scene.
---------

Co-authored-by: v4hn <me@v4hn.de>
sjahr pushed a commit that referenced this pull request Oct 30, 2024
* PSM: keep references to scene_ valid upon receiving full scenes (#2745)

plan_execution-related modules rely on `plan.planning_scene_` in many places
to point to the currently monitored scene (or a diff on top of it).

Before this patch, if the PSM would receive full scenes during execution,
`plan.planning_scene_` would not include later incremental updates anymore
because the monitor created a new diff scene.
---------

Co-authored-by: v4hn <me@v4hn.de>

* fix cmake formatting

---------

Co-authored-by: v4hn <me@v4hn.de>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants