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

Adding use of robot description parameter in the Admittance Controller (backport #1247) #1354

Merged
merged 3 commits into from
Nov 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2024

Replaces #1094.

Adds propagation of robot_description through argument to the kinematics_interface.


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

destogl and others added 2 commits November 6, 2024 21:48
#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 added the conflicts label Nov 6, 2024
Copy link
Contributor Author

mergify bot commented Nov 6, 2024

Cherry-pick of 9439764 has failed:

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

You are currently cherry-picking commit 9439764.
  (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:   admittance_controller/include/admittance_controller/admittance_rule.hpp
	modified:   admittance_controller/include/admittance_controller/admittance_rule_impl.hpp
	modified:   admittance_controller/src/admittance_controller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   admittance_controller/test/test_admittance_controller.hpp

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

@christophfroehlich christophfroehlich marked this pull request as draft November 6, 2024 22:23
@christophfroehlich
Copy link
Contributor

I'm not sure why the robot_description parameter is not passed to the kinematics interface in the tests.

@bmagyar
Copy link
Member

bmagyar commented Nov 7, 2024

I'd advocate for the approach in #1359 . Can make that change in rosdistro too

Copy link

codecov bot commented Nov 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.08%. Comparing base (9b6aa99) to head (3dd2090).
Report is 2 commits behind head on iron.

Additional details and impacted files
@@            Coverage Diff             @@
##             iron    #1354      +/-   ##
==========================================
- Coverage   65.09%   65.08%   -0.01%     
==========================================
  Files         107      107              
  Lines       12184    12184              
  Branches     7494     7495       +1     
==========================================
- Hits         7931     7930       -1     
- Misses       1534     1540       +6     
+ Partials     2719     2714       -5     
Flag Coverage Δ
unittests 65.08% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../include/admittance_controller/admittance_rule.hpp 100.00% <ø> (ø)
...ude/admittance_controller/admittance_rule_impl.hpp 92.34% <100.00%> (ø)
...dmittance_controller/src/admittance_controller.cpp 73.96% <100.00%> (+0.47%) ⬆️
...nce_controller/test/test_admittance_controller.hpp 93.12% <100.00%> (-0.04%) ⬇️

... and 2 files with indirect coverage 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.

semi-binary builds are fine now!

@christophfroehlich christophfroehlich merged commit 927f123 into iron Nov 11, 2024
13 of 32 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-1247 branch November 11, 2024 14:50
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.

3 participants