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 RobotState::getRigidlyConnectedParentLinkModel() (backport #2985) #2993

Merged
merged 3 commits into from
Sep 9, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 5, 2024

Simplify function using getFrameInfo() to yield the link corresponding to the given frame.

The order of frame resolution was wrong here:
If a link frame containing a slash was given, the code was expecting an attached body with a subframe. As these didn't exist, the function falsely returned NULL.

@sjahr: Maybe this is the error you recently observed? Note, that the function was already fixed in MoveIt1.


This is an automatic backport of pull request #2985 done by Mergify.

Simplify function using getFrameInfo() to yield the link corresponding to the given frame.

The order of frame resolution was wrong here:
If a link frame containing a slash was given, the code was expecting an attached body with a subframe.
As these didn't exist, the function falsely returned NULL.

(cherry picked from commit 1f23344)

# Conflicts:
#	moveit_core/robot_state/src/robot_state.cpp
@mergify mergify bot added the conflicts label Sep 5, 2024
Copy link
Author

mergify bot commented Sep 5, 2024

Cherry-pick of 1f23344 has failed:

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

You are currently cherry-picking commit 1f23344de.
  (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 <file>..." to mark resolution)
	both modified:   moveit_core/robot_state/src/robot_state.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

@rhaschke rhaschke merged commit 69c62f8 into humble Sep 9, 2024
5 checks passed
@rhaschke rhaschke deleted the mergify/bp/humble/pr-2985 branch September 9, 2024 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant