Skip to content

Conversation

@saikishor
Copy link
Member

When we use multiple controlers to activate or deactivate, it is quite cumbersome to accept only one --param-file arg as it is not very scalable. For this reason, now the spawner can accept multiple --param-file args and set the respective param_file to those corresponding controllers.

Along with the above mentioned change, now the controllers can accept multiple param-file args as well, and this is very helpful to be able to override parameters between parameter files as how it is done with the standard ROS 2 nodes

@codecov
Copy link

codecov bot commented Oct 19, 2024

Codecov Report

Attention: Patch coverage is 74.63768% with 35 lines in your changes missing coverage. Please review.

Project coverage is 87.91%. Comparing base (23bd1c3) to head (5c79dd5).
Report is 5 commits behind head on master.

Files with missing lines Patch % Lines
...troller_manager/controller_manager/launch_utils.py 0.00% 19 Missing ⚠️
.../controller_manager/controller_manager_services.py 80.00% 5 Missing and 5 partials ⚠️
controller_manager/controller_manager/spawner.py 57.14% 1 Missing and 2 partials ⚠️
controller_manager/src/controller_manager.cpp 70.00% 0 Missing and 3 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1805      +/-   ##
==========================================
- Coverage   87.97%   87.91%   -0.07%     
==========================================
  Files         121      121              
  Lines       12403    12491      +88     
  Branches     1105     1121      +16     
==========================================
+ Hits        10912    10981      +69     
- Misses       1085     1103      +18     
- Partials      406      407       +1     
Flag Coverage Δ
unittests 87.91% <74.63%> (-0.07%) ⬇️

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

Files with missing lines Coverage Δ
controller_manager/controller_manager/__init__.py 100.00% <ø> (ø)
controller_manager/test/test_spawner_unspawner.cpp 99.36% <100.00%> (+0.11%) ⬆️
controller_manager/controller_manager/spawner.py 72.65% <57.14%> (+0.43%) ⬆️
controller_manager/src/controller_manager.cpp 78.26% <70.00%> (+0.15%) ⬆️
.../controller_manager/controller_manager_services.py 79.08% <80.00%> (-0.02%) ⬇️
...troller_manager/controller_manager/launch_utils.py 0.00% <0.00%> (ø)

@saikishor saikishor changed the title [Spawner] Accept multiple parsing multiple --param-file arguments [Spawner] Accept parsing multiple --param-file arguments to spawner Oct 19, 2024
@saikishor saikishor changed the title [Spawner] Accept parsing multiple --param-file arguments to spawner [Spawner] Accept parsing multiple --param-file arguments to spawner Oct 19, 2024
Copy link
Member

@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.

Seems to be a good idea, and implementation LGTM.

Please update the doc section and release notes.

@saikishor
Copy link
Member Author

Seems to be a good idea, and implementation LGTM.

Please update the doc section and release notes.

@christophfroehlich Done

Copy link
Member

@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 :)

@mergify
Copy link
Contributor

mergify bot commented Oct 30, 2024

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

@saikishor saikishor added backport-humble Triggers PR backport to ROS 2 humble. backport-iron labels Nov 4, 2024
@mergify
Copy link
Contributor

mergify bot commented Nov 6, 2024

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

@mergify
Copy link
Contributor

mergify bot commented Nov 18, 2024

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

@saikishor saikishor force-pushed the extend/spawner/parameter_file_parsing branch from 6e131e9 to 5c79dd5 Compare November 25, 2024 21:30
@bmagyar bmagyar merged commit 73fe227 into ros-controls:master Nov 28, 2024
18 of 21 checks passed
@saikishor saikishor deleted the extend/spawner/parameter_file_parsing branch November 28, 2024 11:59
mergify bot pushed a commit that referenced this pull request Nov 28, 2024
…#1805)

(cherry picked from commit 73fe227)

# Conflicts:
#	controller_manager/controller_manager/controller_manager_services.py
#	controller_manager/controller_manager/launch_utils.py
#	controller_manager/controller_manager/spawner.py
#	controller_manager/src/controller_manager.cpp
#	controller_manager/test/test_spawner_unspawner.cpp
#	doc/release_notes.rst
#	ros2controlcli/ros2controlcli/verb/load_controller.py
christophfroehlich pushed a commit that referenced this pull request Dec 3, 2024
… (backport #1805) (#1894)

---------

Co-authored-by: Sai Kishor Kothakota <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-humble Triggers PR backport to ROS 2 humble.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants