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

fix: OctoMap and Filtered_Cloud Not Updating During Movement Execution (backport #3209) #3211

Merged
merged 6 commits into from
Jan 12, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 9, 2025

Description

MutuallyExclusive callbackgroup has been added to point_cloud_subscriber_ to allow updating octomap during robot motion. See #2192


Additional notes

  • I was not able to do the same fix to the depth_image_octomap_updater since image_transport::create_camera_subscription seems to not allow passing SubscriptionOptions.

  • I noticed that there is a big computational time mismatch between the two approaches (depth/pointcloud). After digging in a bit i found that the main computational time difference comes from lazy_free_space_updater but unfortunately I have not time to fix it. I will use the pointcloud instead._


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

#3209)

* fix: adds MutuallyExclusive to pointcloud subscriber to allow octomap updates during motion

* refactor: adjust macro for readability

(cherry picked from commit 246aa58)

# Conflicts:
#	moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
#	moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp
@mergify mergify bot added the conflicts label Jan 9, 2025
Copy link
Author

mergify bot commented Jan 9, 2025

Cherry-pick of 246aa58 has failed:

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

You are currently cherry-picking commit 246aa58e4.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   moveit_ros/perception/pointcloud_octomap_updater/include/moveit/pointcloud_octomap_updater/pointcloud_octomap_updater.hpp
	both modified:   moveit_ros/perception/pointcloud_octomap_updater/src/pointcloud_octomap_updater.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

@sea-bass
Copy link
Contributor

sea-bass commented Jan 10, 2025

Seems like #664 also needs a backport first here.

See #3220 is merged first, and then merge this.

@sea-bass sea-bass force-pushed the mergify/bp/humble/pr-3209 branch from b1adae1 to b14508a Compare January 10, 2025 02:49
@codecov-commenter
Copy link

codecov-commenter commented Jan 10, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.40%. Comparing base (edddadb) to head (c5c3c03).
Report is 3 commits behind head on humble.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3211      +/-   ##
==========================================
- Coverage   51.40%   51.40%   -0.00%     
==========================================
  Files         382      382              
  Lines       31893    31893              
==========================================
- Hits        16393    16392       -1     
- Misses      15500    15501       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sea-bass sea-bass merged commit 4ad2d10 into humble Jan 12, 2025
7 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-3209 branch January 12, 2025 22:32
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.

3 participants