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

rqt_cm: Fix handling of unconfigured controllers during spawn action #1794

Conversation

SantoshGovindaraj
Copy link
Contributor

Description:

This PR addresses an #1791 issue where controllers in the "unconfigured" state were being loaded rather than configured during the action_spawn process. The previous behavior could lead to errors when attempting to activate controllers that were not yet configured.

Changes made:

  • Updated the handling of the "unconfigured" state to configure the controller when the action is action_spawn, ensuring proper configuration before activation.
  • This replaces the previous use of load_controller during action_spawn.

Testing:

I was unable to test the changes with diffbot.launch.py due to build issues with ros2_controllers on my system running ROS Iron, as the rolling build is not compatible with iron.

Copy link

codecov bot commented Oct 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.86%. Comparing base (0433960) to head (86fa815).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1794      +/-   ##
==========================================
+ Coverage   86.83%   86.86%   +0.02%     
==========================================
  Files         121      121              
  Lines       11542    11541       -1     
  Branches     1054     1054              
==========================================
+ Hits        10023    10025       +2     
+ Misses       1144     1142       -2     
+ Partials      375      374       -1     
Flag Coverage Δ
unittests 86.86% <ø> (+0.02%) ⬆️

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

see 1 file with indirect coverage changes

@christophfroehlich christophfroehlich changed the title Fix handling of unconfigured controllers during spawn action rqt_cm: Fix handling of unconfigured controllers during spawn action Oct 14, 2024
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.

Thanks. I tested it successfully. Is there a reason why you marked this PR as draft?

@christophfroehlich christophfroehlich linked an issue Oct 14, 2024 that may be closed by this pull request
8 tasks
@christophfroehlich christophfroehlich added backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron. labels Oct 14, 2024
@SantoshGovindaraj
Copy link
Contributor Author

Thanks, @christophfroehlich , for your support. I kept the PR in draft because I wasn’t able to perform proper testing. I thought some code changes might be needed based on the results, which is why I left it as a draft.

@SantoshGovindaraj
Copy link
Contributor Author

I believe, everything went fine. So I change PR back to ready

@SantoshGovindaraj
Copy link
Contributor Author

@christophfroehlich Please let me know if there any further changes needed for this PR?

Copy link
Member

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

LGTM

@bmagyar bmagyar merged commit 0ba1428 into ros-controls:master Oct 15, 2024
21 checks passed
mergify bot pushed a commit that referenced this pull request Oct 15, 2024
mergify bot pushed a commit that referenced this pull request Oct 15, 2024
christophfroehlich pushed a commit that referenced this pull request Oct 16, 2024
…ontroller (#1794) (#1797)

(cherry picked from commit 0ba1428)

Co-authored-by: Santosh Govindaraj <[email protected]>
christophfroehlich pushed a commit that referenced this pull request Oct 16, 2024
…ontroller (#1794) (#1798)

(cherry picked from commit 0ba1428)

Co-authored-by: Santosh Govindaraj <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-humble This label should be used by maintaines only! Label triggers PR backport to ROS2 humble. backport-iron This label should be used by maintaines only! Label triggers PR backport to ROS2 Iron.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rqt_controller_manager: Error in logic for controller activation
4 participants