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

Add controller node options args to be able to set controller specific node arguments #1713

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

Conversation

saikishor
Copy link
Member

@saikishor saikishor commented Aug 23, 2024

A different approach of #1712

    robot_controller_spawner = Node(
        package="controller_manager",
        executable="spawner",
        arguments=["diffbot_base_controller", "--param-file", controller_config, "--controller-ros-args", '--ros-args -r /diffbot_base_controller/cmd_vel:=/cmd_vel'],
    )

Fixes: #1711
Fixes: #1714

Copy link

codecov bot commented Aug 23, 2024

Codecov Report

Attention: Patch coverage is 78.78788% with 7 lines in your changes missing coverage. Please review.

Project coverage is 87.70%. Comparing base (7374c43) to head (32583ca).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
controller_manager/src/controller_manager.cpp 80.00% 1 Missing and 2 partials ⚠️
controller_manager/controller_manager/spawner.py 50.00% 1 Missing and 1 partial ⚠️
...r_manager/test/test_controller/test_controller.cpp 50.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1713      +/-   ##
==========================================
- Coverage   87.73%   87.70%   -0.04%     
==========================================
  Files         122      122              
  Lines       13010    13043      +33     
  Branches     1165     1170       +5     
==========================================
+ Hits        11414    11439      +25     
- Misses       1165     1169       +4     
- Partials      431      435       +4     
Flag Coverage Δ
unittests 87.70% <78.78%> (-0.04%) ⬇️

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

Files with missing lines Coverage Δ
...r_manager/test/test_controller/test_controller.hpp 100.00% <ø> (ø)
controller_manager/test/test_spawner_unspawner.cpp 96.56% <100.00%> (+0.08%) ⬆️
controller_manager/controller_manager/spawner.py 72.38% <50.00%> (-0.69%) ⬇️
...r_manager/test/test_controller/test_controller.cpp 92.15% <50.00%> (-3.59%) ⬇️
controller_manager/src/controller_manager.cpp 76.35% <80.00%> (-0.04%) ⬇️

Copy link
Contributor

mergify bot commented Aug 23, 2024

This pull request is in conflict. Could you fix it @saikishor?

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.

I like, but needs some tests for it and advertisement in the release notes. We could also think of deprecating the "old way" #1712

Tested successfully with ros-controls/ros2_control_demos#577

Copy link
Member Author

@saikishor saikishor left a comment

Choose a reason for hiding this comment

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

Fix for compilation

controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
@saikishor
Copy link
Member Author

I like, but needs some tests for it and advertisement in the release notes. We could also think of deprecating the "old way" #1712

Tested successfully with ros-controls/ros2_control_demos#577

@christophfroehlich I've added the tests for this case and the release_notes.

Thank you!

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

Copy link
Contributor

mergify bot commented Oct 16, 2024

This pull request is in conflict. Could you fix it @saikishor?

Copy link
Contributor

mergify bot commented Oct 17, 2024

This pull request is in conflict. Could you fix it @saikishor?

@saikishor saikishor force-pushed the add/controller/node_options_args branch from 5bb8a11 to 938bcba Compare October 17, 2024 09:48
@saikishor
Copy link
Member Author

@bmagyar the CI seems to be happy

@saikishor saikishor force-pushed the add/controller/node_options_args branch from 938bcba to c0b9e54 Compare October 19, 2024 07:01
@saikishor saikishor force-pushed the add/controller/node_options_args branch from c0b9e54 to efda2f6 Compare October 29, 2024 15:16
@christophfroehlich
Copy link
Contributor

I'll add example_interfaces to the debian image used for the CI.

@saikishor
Copy link
Member Author

I'll add example_interfaces to the debian image used for the CI.

Thank you @christophfroehlich

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 (debian CI is happy now, too).

Copy link
Contributor

mergify bot commented Oct 30, 2024

This pull request is in conflict. Could you fix it @saikishor?

@saikishor saikishor force-pushed the add/controller/node_options_args branch 2 times, most recently from 11b2948 to 59b4f63 Compare December 3, 2024 21:17
@bmagyar
Copy link
Member

bmagyar commented Dec 9, 2024

Is this still needed?

@saikishor
Copy link
Member Author

saikishor commented Dec 9, 2024

Is this still needed?

@bmagyar yes, we will still need it
Right now, we can only override from main one with a hack. This is good to have, then we can relay topic and do things at runtime with spawner, rather than readjusting the ros2_control_node and relaunching

@saikishor saikishor force-pushed the add/controller/node_options_args branch from 997b381 to 32583ca Compare December 17, 2024 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants