ros-controls / ros2_controllers

Generic robotic controllers to accompany ros2_control
https://control.ros.org
Apache License 2.0
356 stars 319 forks source link

Fix bug for displaying all controllers (backport #1259) #1271

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago

Hi,

When using the rqt_joint_trajectory_controller, not all the controllers are shown on the controller button. This is because the list of limits was not accumulated, and only the last one was considered. This PR fixes this, showing all the valid controllers.

I hope it helps Francisco


This is an automatic backport of pull request #1259 done by Mergify.

mergify[bot] commented 1 month ago

Cherry-pick of 3be3fe95c3eb2a6a7e07bde2b96a9b8acc558d9a has failed:

On branch mergify/bp/humble/pr-1259
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 3be3fe9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

christophfroehlich commented 1 month ago

Let's merge backport #1274 first

mergify[bot] commented 1 month ago

This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?

bmagyar commented 1 month ago

@mergifyio rebase

mergify[bot] commented 1 month ago

rebase

β˜‘οΈ Nothing to do

- [ ] `-conflict` [πŸ“Œ rebase requirement] - [X] `-closed` [πŸ“Œ rebase requirement] - [X] `queue-position=-1` [πŸ“Œ rebase requirement] - [X] any of: - [X] `#commits-behind>0` [πŸ“Œ rebase requirement] - [ ] `#commits>1` [πŸ“Œ rebase requirement] - [ ] `-linear-history` [πŸ“Œ rebase requirement]
codecov[bot] commented 1 month ago

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 65.22%. Comparing base (9e07ac5) to head (98c5ccb). Report is 1 commits behind head on humble.

Files with missing lines Patch % Lines
...ajectory_controller/joint_trajectory_controller.py 0.00% 2 Missing :warning:
Additional details and impacted files ```diff @@ Coverage Diff @@ ## humble #1271 +/- ## ========================================== - Coverage 65.23% 65.22% -0.02% ========================================== Files 103 103 Lines 11435 11436 +1 Branches 7252 7253 +1 ========================================== - Hits 7460 7459 -1 - Misses 1476 1477 +1 - Partials 2499 2500 +1 ``` | [Flag](https://app.codecov.io/gh/ros-controls/ros2_controllers/pull/1271/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls) | Coverage Ξ” | | |---|---|---| | [unittests](https://app.codecov.io/gh/ros-controls/ros2_controllers/pull/1271/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls) | `65.22% <0.00%> (-0.02%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#carryforward-flags-in-the-pull-request-comment) to find out more. | [Files with missing lines](https://app.codecov.io/gh/ros-controls/ros2_controllers/pull/1271?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls) | Coverage Ξ” | | |---|---|---| | [...ajectory\_controller/joint\_trajectory\_controller.py](https://app.codecov.io/gh/ros-controls/ros2_controllers/pull/1271?src=pr&el=tree&filepath=rqt_joint_trajectory_controller%2Frqt_joint_trajectory_controller%2Fjoint_trajectory_controller.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls#diff-cnF0X2pvaW50X3RyYWplY3RvcnlfY29udHJvbGxlci9ycXRfam9pbnRfdHJhamVjdG9yeV9jb250cm9sbGVyL2pvaW50X3RyYWplY3RvcnlfY29udHJvbGxlci5weQ==) | `0.00% <0.00%> (ΓΈ)` | | ... and [1 file with indirect coverage changes](https://app.codecov.io/gh/ros-controls/ros2_controllers/pull/1271/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=ros-controls)