-
Notifications
You must be signed in to change notification settings - Fork 310
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
[CM] Use robot_description
topic instead of parameter and don't crash on empty URDF 🦿 (backport #940)
#1052
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
resolving conflicts
hardware_interface/include/hardware_interface/resource_manager.hpp
Outdated
Show resolved
Hide resolved
hardware_interface/include/hardware_interface/resource_manager.hpp
Outdated
Show resolved
Hide resolved
I see this now also has a sneaky backport of #1054 , is that intended? |
yes, it's easier to do it at once. But I can also split, once when I actually figure out what is the problem... |
yes , please split it. I'd prefer if we didn't have extra things creeping in |
I think there's too much stuff in this PR. The CI clearly isn't happy |
…sh on empty URDF 🦿 (#940) * on startup wait for robot description, however allow receiving later --------- Co-authored-by: Dr. Denis <[email protected]> (cherry picked from commit d299208) # Conflicts: # controller_manager/CMakeLists.txt # controller_manager/src/controller_manager.cpp # hardware_interface/doc/mock_components_userdoc.rst # hardware_interface/include/hardware_interface/resource_manager.hpp # hardware_interface/src/resource_manager.cpp # hardware_interface/test/test_resource_manager.cpp
8bd416c
to
d89e9f7
Compare
rebased and dropped the content related to #1054 |
Co-authored-by: Noel Jiménez García <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rest LGTM
Co-authored-by: Sai Kishor Kothakota <[email protected]>
Hello, any update on this one ? |
This is an automatic backport of pull request #940 done by Mergify.
Cherry-pick of d299208 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com