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

Simplify scene update that does not include new robot_state #3206

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

MarqRazz
Copy link
Contributor

@MarqRazz MarqRazz commented Jan 7, 2025

Description

Updates changes applied in #3187 to match the back port to MoveIt1.

@MarqRazz MarqRazz requested a review from rhaschke January 7, 2025 16:54
Copy link
Contributor

@rhaschke rhaschke left a comment

Choose a reason for hiding this comment

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

I assume you verified that this simplification still fixes your original issue.

@sea-bass sea-bass added backport-humble Mergify label that triggers a PR backport to Humble backport-jazzy Mergify label that triggers a PR backport to Jazzy labels Jan 7, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 7, 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 45.64%. Comparing base (80c7f61) to head (1892706).
Report is 1 commits behind head on main.

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

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3206      +/-   ##
==========================================
- Coverage   45.64%   45.64%   -0.00%     
==========================================
  Files         714      714              
  Lines       62286    62284       -2     
  Branches     7530     7529       -1     
==========================================
- Hits        28426    28424       -2     
+ Misses      33694    33693       -1     
- Partials      166      167       +1     

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

@MarqRazz
Copy link
Contributor Author

MarqRazz commented Jan 7, 2025

Yes I verified that this does fix my issue. FYI I do see small differences between the diff scene_ and CSM, for example
[move_group.moveit.moveit.ros.planning_scene_monitor ]: CSM: 0.814504, diff scene_: 0.812823, but it is so small it is not effecting my motion plans like it was before.

@rhaschke
Copy link
Contributor

rhaschke commented Jan 7, 2025

I do see small differences between the diff scene_ and CSM, for example CSM: 0.814504, diff scene_: 0.812823

I guess those are some randomly picked joint values?
CSM updates are much more frequent than PS updates. If the robot gets to rest, they should become identical eventually.

@rhaschke rhaschke added this pull request to the merge queue Jan 7, 2025
@rhaschke rhaschke removed this pull request from the merge queue due to a manual request Jan 7, 2025
@rhaschke
Copy link
Contributor

rhaschke commented Jan 7, 2025

Let's wait for moveit/moveit#3683 before merging this.

@MarqRazz
Copy link
Contributor Author

MarqRazz commented Jan 7, 2025

I guess those are some randomly picked joint values? CSM updates are much more frequent than PS updates. If the robot gets to rest, they should become identical eventually.

That is showing values for joint_1 of my robot when newPlanningSceneMessage is called with scene.is_diff=false and an empty joint_state. At this point of my setup the robot motion is complete so it depends on the last time the planning_scene_monitor updated it's robot_state / published at it's 2Hz rate if will include this small change in position.

Copy link
Contributor

@sea-bass sea-bass left a comment

Choose a reason for hiding this comment

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

I think your commit invalidated the other approving reviews. Here's another!

@rhaschke rhaschke added this pull request to the merge queue Jan 7, 2025
Merged via the queue into moveit:main with commit 75286c7 Jan 7, 2025
9 checks passed
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
* Simplify scene update that does not include new robot_state

* Further simplify condition

---------

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 75286c7)
mergify bot pushed a commit that referenced this pull request Jan 7, 2025
* Simplify scene update that does not include new robot_state

* Further simplify condition

---------

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 75286c7)
@MarqRazz MarqRazz deleted the planning_scene_cleanup branch January 7, 2025 22:06
sea-bass pushed a commit that referenced this pull request Jan 7, 2025
…3207)

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 75286c7)

Co-authored-by: Marq Rasmussen <marq.razz@gmail.com>
sea-bass pushed a commit that referenced this pull request Jan 7, 2025
…3208)

Co-authored-by: Robert Haschke <rhaschke@users.noreply.github.com>
(cherry picked from commit 75286c7)

Co-authored-by: Marq Rasmussen <marq.razz@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-humble Mergify label that triggers a PR backport to Humble backport-jazzy Mergify label that triggers a PR backport to Jazzy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants