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

Reverts #2985, Ports moveit #3388 #3470 #3539 (backport #3284) #3319

Merged
merged 3 commits into from
Feb 6, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 6, 2025

Description

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

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

* Revert "Fix RobotState::getRigidlyConnectedParentLinkModel() (#2985)"

This reverts commit 1f23344.

* Merge PR #3388: Generalize RobotState::setFromIK()

So far, setFromIK only accepted target (link) frames that were rigidly connected to a solver's tip frame.
This, for example, excluded the fingertip of an actuated gripper, because that would be separated by an
active joint from the arm's tooltip. However, as long as this joint is not part of the JMG,
the corresponding transform can be considered as fixed as well.

This PR generalizes the functions getRigidlyConnectedParentLinkModel() in
RobotState and RobotModel to receive an optional JMG pointer.
If present, only (active) joints from that group are considered non-fixed.
This PR also enables subframe support for setFromIK - simply by using
getRigidlyConnectedParentLinkModel(), which already supported that.

There is one drawback of this approach: A repeated application of setFromIK
with the same target frame and JMG (as in computeCartesianPath()), will
repeat the search for the common fixed parent link.
Additionally, the passed RobotState needs to be up-to-date.
We could mitigate this by pulling the corresponding code into a separate
function and calling it once in computeCartesianPath().

* Merge PR #3470: Avoid global transforms in getRigidlyConnectedParentLinkModel()

Fixes #3388

* Merge pull request #3539 from v4hn/find-links-with-slashes-again

find links with slashes again

* Ports to ROS2 and fixes problems introduced in merge conflicts.

* Fixes formatting.

* Makes robot_state_test.cpp include gmock.

* Updates trajectory_msgs::JointTrajectory to trajectory_msgs::msg::JointTrajectory.

* Adds braces to make clang-tidy happy.

* Removes test-only arguments; adds more comments.

* Fixes formatting.

* Fixes formatting.

* Adds missing class scope.

---------

Co-authored-by: Robert Haschke <[email protected]>
Co-authored-by: Robert Haschke <[email protected]>
Co-authored-by: Michael Görner <[email protected]>
Co-authored-by: Sebastian Jahr <[email protected]>
(cherry picked from commit 1794b8e)

# Conflicts:
#	moveit_core/robot_model/include/moveit/robot_model/robot_model.hpp
#	moveit_core/robot_state/CMakeLists.txt
#	moveit_core/robot_state/include/moveit/robot_state/attached_body.hpp
#	moveit_core/robot_state/include/moveit/robot_state/robot_state.hpp
#	moveit_core/robot_state/src/cartesian_interpolator.cpp
#	moveit_core/robot_state/src/robot_state.cpp
#	moveit_core/robot_state/test/robot_state_test.cpp
@mergify mergify bot added the conflicts label Feb 6, 2025
Copy link
Author

mergify bot commented Feb 6, 2025

Cherry-pick of 1794b8e has failed:

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

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

Changes to be committed:
	modified:   moveit_core/robot_model/src/robot_model.cpp
	modified:   moveit_ros/planning_interface/test/move_group_interface_cpp_test.cpp
	modified:   moveit_ros/planning_interface/test/subframes_test.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   moveit_core/robot_model/include/moveit/robot_model/robot_model.hpp
	both modified:   moveit_core/robot_state/CMakeLists.txt
	deleted by us:   moveit_core/robot_state/include/moveit/robot_state/attached_body.hpp
	deleted by us:   moveit_core/robot_state/include/moveit/robot_state/robot_state.hpp
	both modified:   moveit_core/robot_state/src/cartesian_interpolator.cpp
	both modified:   moveit_core/robot_state/src/robot_state.cpp
	both modified:   moveit_core/robot_state/test/robot_state_test.cpp

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 Feb 6, 2025

Same here @rr-mark -- could you look at the Humble conflicts?

@rr-mark
Copy link
Contributor

rr-mark commented Feb 6, 2025

#3323

@sea-bass sea-bass removed the conflicts label Feb 6, 2025
@codecov-commenter
Copy link

codecov-commenter commented Feb 6, 2025

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

Codecov Report

Attention: Patch coverage is 84.61538% with 4 lines in your changes missing coverage. Please review.

Project coverage is 51.41%. Comparing base (c3cd237) to head (adfb33b).
Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
moveit_core/robot_model/src/robot_model.cpp 75.00% 3 Missing ⚠️
...it_core/robot_state/src/cartesian_interpolator.cpp 0.00% 1 Missing ⚠️

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

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3319      +/-   ##
==========================================
+ Coverage   51.37%   51.41%   +0.04%     
==========================================
  Files         382      382              
  Lines       31874    31892      +18     
==========================================
+ Hits        16372    16394      +22     
+ Misses      15502    15498       -4     

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

@sea-bass sea-bass merged commit 9aefcb8 into humble Feb 6, 2025
7 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-3284 branch February 6, 2025 14:13
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