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

[CM] Add controller_manager activity topic #2006

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

saikishor
Copy link
Member

As discussed in the ros2_control WG meeting on 15th Jan 2025

I've added a topic to the CM inorder to publish information on changes in the CM. This is quite useful to have when developing applications that need to be dynamic enough with the changes in CM. Right now, the only way is to spam the CM with lot of service requests.

It should look something like the below

---
header:
  stamp:
    sec: 1737128088
    nanosec: 39885323
  frame_id: ''
controllers:
- name: forward_position_controller
  state:
    id: 2
    label: inactive
- name: position_controller
  state:
    id: 3
    label: active
- name: joint2_position_controller
  state:
    id: 3
    label: active
- name: joint1_position_controller
  state:
    id: 3
    label: active
- name: joint_state_broadcaster
  state:
    id: 3
    label: active
hardware_components:
- name: RRBot
  state:
    id: 3
    label: active
---

@saikishor saikishor force-pushed the add/cm/activity/topic branch from dbe3071 to 6768145 Compare January 17, 2025 15:36
Copy link

codecov bot commented Jan 17, 2025

Codecov Report

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

Project coverage is 89.34%. Comparing base (f8c03cc) to head (7952d89).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
...ontroller_manager/test/test_controller_manager.cpp 90.00% 0 Missing and 3 partials ⚠️
controller_manager/src/controller_manager.cpp 96.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2006      +/-   ##
==========================================
- Coverage   89.35%   89.34%   -0.01%     
==========================================
  Files         130      130              
  Lines       14576    14641      +65     
  Branches     1258     1265       +7     
==========================================
+ Hits        13024    13081      +57     
- Misses       1088     1090       +2     
- Partials      464      470       +6     
Flag Coverage Δ
unittests 89.34% <93.75%> (-0.01%) ⬇️

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

Files with missing lines Coverage Δ
.../include/controller_manager/controller_manager.hpp 100.00% <ø> (ø)
hardware_interface/src/resource_manager.cpp 75.15% <100.00%> (+0.12%) ⬆️
controller_manager/src/controller_manager.cpp 76.70% <96.66%> (+0.54%) ⬆️
...ontroller_manager/test/test_controller_manager.cpp 95.87% <90.00%> (-0.23%) ⬇️

... and 2 files with indirect coverage changes

@saikishor saikishor changed the title Add Controller Manager Activity topic [CM] Add controller_manager activity topic Jan 17, 2025
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.

great addition. Should we also add a publisher section here describing this?
https://control.ros.org/rolling/doc/ros2_control/controller_manager/doc/userdoc.html#subscribers

@saikishor
Copy link
Member Author

great addition. Should we also add a publisher section here describing this?
https://control.ros.org/rolling/doc/ros2_control/controller_manager/doc/userdoc.html#subscribers

Actually, I want to document all the Services and Publishers from the controller manager. I don't know if I have to do it in this PR or a separate PR. What's your opinion @christophfroehlich

@christophfroehlich
Copy link
Contributor

great addition. Should we also add a publisher section here describing this?
https://control.ros.org/rolling/doc/ros2_control/controller_manager/doc/userdoc.html#subscribers

Actually, I want to document all the Services and Publishers from the controller manager. I don't know if I have to do it in this PR or a separate PR. What's your opinion @christophfroehlich

please add the docs for this new publisher with this PR.

@saikishor
Copy link
Member Author

@christophfroehlich done! 👍🏾

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.

Thx!

@@ -424,6 +425,13 @@ class ControllerManager : public rclcpp::Node
const std::string & ctrl_name, std::vector<std::string>::iterator controller_iterator,
bool append_to_controller);

/**
* @brief Method to publish the state of the controller manager.
Copy link
Member

@Maverobot Maverobot Jan 19, 2025

Choose a reason for hiding this comment

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

It would be great to be consistent with the style of the existing docstrings, i.e. start the sentence with a verb for "brief". For example, I would put it here

/**
 * @brief Publish the state of the controller manager.
 * 
 * The state includes the list of controllers and the list of hardware interfaces along with their states.
 */

However, I realize that we have already different docstring styles in this file. An example of another style is:

/// A method to register a callback to be called when the list is switched
/**
* \param[in] callback Callback to be called when the list is switched
*/

Is it intentional to have these different styles? @christophfroehlich

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