Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 26, 2024

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](https://mergify.com).

(cherry picked from commit 3be3fe9)

# Conflicts:
#	rqt_joint_trajectory_controller/rqt_joint_trajectory_controller/joint_trajectory_controller.py
@mergify mergify bot added the conflicts label Aug 26, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Aug 26, 2024

Cherry-pick of 3be3fe9 has failed:

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

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
Copy link
Contributor

let's merge backport #1273 first

@christophfroehlich christophfroehlich marked this pull request as draft August 26, 2024 19:18
@mergify
Copy link
Contributor Author

mergify bot commented Aug 29, 2024

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

@bmagyar bmagyar marked this pull request as ready for review August 29, 2024 11:44
@bmagyar bmagyar removed the conflicts label Aug 29, 2024
@bmagyar bmagyar merged commit 97c7a82 into iron Aug 29, 2024
1 check passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-1259 branch August 29, 2024 11:44
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