Skip to content

Fix controller dependencies (backport #837) - #840

Merged
ahcorde merged 2 commits into
humblefrom
mergify/bp/humble/pr-837
Apr 24, 2026
Merged

Fix controller dependencies (backport #837)#840
ahcorde merged 2 commits into
humblefrom
mergify/bp/humble/pr-837

Conversation

@mergify

@mergify mergify Bot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

We only use JTC or forward_command_controller for the demos, the specializations got removed with ros-controls/ros2_controllers#2016


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

(cherry picked from commit 54addf2)

# Conflicts:
#	gz_ros2_control_demos/package.xml
@mergify mergify Bot added the conflicts label Apr 24, 2026
@mergify
mergify Bot requested a review from ahcorde as a code owner April 24, 2026 07:34
@mergify mergify Bot added the conflicts label Apr 24, 2026
@mergify

mergify Bot commented Apr 24, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 54addf2 has failed:

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

You are currently cherry-picking commit 54addf2.
  (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:   gz_ros2_control_demos/package.xml

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

@mergify mergify Bot mentioned this pull request Apr 24, 2026
Replaced 'tricycle_controller' with 'tricycle_steering_controller' and removed 'velocity_controllers' from dependencies.
@ahcorde
ahcorde merged commit 41c8fea into humble Apr 24, 2026
9 checks passed
@ahcorde
ahcorde deleted the mergify/bp/humble/pr-837 branch April 24, 2026 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants