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.

Sign up for GitHub

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

Jump to bottom

Adding use of robot description parameter in the Admittance Controller #1247

Merged
merged 9 commits into from
Nov 6, 2024
Merged

Adding use of robot description parameter in the Admittance Controller #1247

merged 9 commits into from
Nov 6, 2024

Conversation

destogl
Copy link
Member

@destogl destogl commented Aug 14, 2024 •
edited
Loading

Replaces #1094.

Adds propagation of robot_description through argument to the kinematics_interface.

@destogl destogl mentioned this pull request Aug 14, 2024
Closed
saikishor
saikishor approved these changes Aug 14, 2024
View reviewed changes
Copy link
Member

@saikishor saikishor left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM
We just have to merge the Kinematics interface before merging this

@Nibanovic Nibanovic force-pushed the admittance-robot-description-param-1094 branch from 88b66e4 to 48131cd Compare September 19, 2024 08:59
@destogl destogl closed this Nov 4, 2024
@destogl destogl reopened this Nov 4, 2024
@destogl destogl closed this Nov 4, 2024
@destogl destogl reopened this Nov 4, 2024
This was referenced Nov 5, 2024
Closed
Closed
@christophfroehlich christophfroehlich added backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron. and removed backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. labels Nov 5, 2024
@christophfroehlich christophfroehlich added backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron. and removed backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron. labels Nov 5, 2024
This was linked to issues Nov 5, 2024
CI build job jazzy/source failed! #1347
Closed
CI build job iron/source failed! #1348
Closed
CI build job rolling/source failed! #1349
Closed
christophfroehlich
christophfroehlich requested changes Nov 5, 2024
View reviewed changes
Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

all the tests fail, @destogl could you have a look please?

christophfroehlich
christophfroehlich approved these changes Nov 6, 2024
View reviewed changes
Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

LGTM. but some jobs failed with unrelated tests, for example from JTC. Idk why.

@christophfroehlich christophfroehlich merged commit 9439764 into ros-controls:master Nov 6, 2024
13 of 18 checks passed
mergify bot pushed a commit that referenced this pull request Nov 6, 2024
@destogl @mergify
Adding use of robot description parameter in the Admittance Controller (
29fbca0 
#1247)

---------

Co-authored-by: Kevin DeMarco <[email protected]>
Co-authored-by: Nikola Banovic <[email protected]>
Co-authored-by: Bence Magyar <[email protected]>
Co-authored-by: Christoph Fröhlich <[email protected]>
(cherry picked from commit 9439764)

# Conflicts:
#	admittance_controller/test/test_admittance_controller.hpp
@mergify mergify bot mentioned this pull request Nov 6, 2024
Merged
christophfroehlich added a commit that referenced this pull request Nov 11, 2024
@mergify @SyllogismRXS
@Nibanovic @destogl @christophfroehlich
Adding use of robot description parameter in the Admittance Controlle…
927f123 
…r (backport #1247) (#1354)

---------

Co-authored-by: Kevin DeMarco <[email protected]>
Co-authored-by: Nikola Banovic <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
Co-authored-by: Christoph Froehlich <[email protected]>
@destogl destogl deleted the admittance-robot-description-param-1094 branch November 11, 2024 17:09
@destogl
Copy link
Member Author

destogl commented Nov 11, 2024

Thanks for fixing this guys!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saikishor saikishor saikishor approved these changes

@christophfroehlich christophfroehlich christophfroehlich approved these changes

@aprotyas aprotyas Awaiting requested review from aprotyas

@bmagyar bmagyar Awaiting requested review from bmagyar

@fmauch fmauch Awaiting requested review from fmauch

@moriarty moriarty Awaiting requested review from moriarty

@progtologist progtologist Awaiting requested review from progtologist

@DasRoteSkelett DasRoteSkelett Awaiting requested review from DasRoteSkelett

@bijoua29 bijoua29 Awaiting requested review from bijoua29

@mcbed mcbed Awaiting requested review from mcbed

Assignees
No one assigned
Labels
backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CI build job rolling/source failed! CI build job iron/source failed! CI build job jazzy/source failed!
6 participants
@destogl @christophfroehlich @saikishor @SyllogismRXS @Nibanovic @bmagyar