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

Merge current master into cm-remove-robot-description #1608

Conversation

fmauch
Copy link
Contributor

@fmauch fmauch commented Jul 9, 2024

#1358 has been hanging there for a while now. This PR merges the current master to resolve conflicts. With the result we should be able to review #1358 properly.

destogl and others added 30 commits February 1, 2024 20:46
…escription` and update docs regarding this (ros-controls#1410)

* Use `robot_description` instead of `~/robot_description` topic
   Using robot_description by default instead will work for most people out of the box while also working correctly with different descriptions in different namespaces when using remaps.
  Nowadays, the parameter is deprecated and will be removed.

---------

Co-authored-by: Sai Kishor Kothakota <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
…controls#1357)

* Remove deprecated parameters and warnings about getting robot descriptions from the parameter.

---------

Co-authored-by: Felix Exner (fexner) <[email protected]>
christophfroehlich and others added 20 commits June 3, 2024 12:09
…bugging easier. (ros-controls#1580)

* Small improvements to the error output in component parser to make debugging easier.

* Correct formatting.
…d add error handling there to avoid stack crashing when error happens. (ros-controls#1354)
…os-controls#971)

---------

Co-authored-by: AndyZe <[email protected]>
Co-authored-by: bijoua <[email protected]>
Co-authored-by: Guillaume Walck <[email protected]>
Co-authored-by: Christoph Fröhlich <[email protected]>
Co-authored-by: Sai Kishor Kothakota <[email protected]>
Co-authored-by: Manuel M <[email protected]>
…rs (ros-controls#1021)

---------

Co-authored-by: Bence Magyar <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
Co-authored-by: Christoph Fröhlich <[email protected]>
…HardwareComponent (ros-controls#1585)

* Add the `init` API in the hardware interfaces to parse the logging and clock interfaces
* Change RCUTILS logging to RCLCPP logging
* rename `ResourceManager` to `resource_manager` in the logger
* support for the default `rm_logger_` if none provided

---------

Co-authored-by: Dr. Denis <[email protected]>
Copy link
Contributor

mergify bot commented Jul 9, 2024

@fmauch, all pull requests must be targeted towards the master development branch.
Once merged into master, it is possible to backport to cm-remove-robot-description-from-param, but it must be in master
to have these changes reflected into new distributions.

@christophfroehlich christophfroehlich merged commit e61a17f into ros-controls:cm-remove-robot-description-from-param Jul 9, 2024
3 checks passed
@fmauch fmauch deleted the cm-remove-robot-description-from-param branch July 9, 2024 12:42
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.