Skip to content

Implemented a controller coordinator (backport #63) #64

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

Open
wants to merge 1 commit into
base: jazzy
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 9, 2025

Changes Made

This PR implements a coordinator to manage activating and deactivating controllers using a single endpoint. This feature is motivated by the desire to launch controllers in a single launch file, but waiting to activate them until a future point. Such a scenario occurs when you want to switch back and forth between a company-provided control system and a custom control system.

Testing

Tested using the BlueROV2 Heavy and in simulation using Blue


This is an automatic backport of pull request #63 done by [Mergify](https://mergify.com).

* Fixed stale demos

* Update package versions

* Fix obsolete tf2 header

* Added a coordinator to activate controllers/hardware

* Address pr comments

(cherry picked from commit 289f6e0)

# Conflicts:
#	auv_control_demos/CHANGELOG.md
#	auv_control_demos/package.xml
#	auv_control_msgs/CHANGELOG.md
#	auv_control_msgs/package.xml
#	auv_controllers/CHANGELOG.md
#	auv_controllers/package.xml
#	controller_common/CHANGELOG.md
#	controller_common/package.xml
#	end_effector_trajectory_controller/CHANGELOG.md
#	end_effector_trajectory_controller/package.xml
#	ik_solvers/CHANGELOG.md
#	ik_solvers/package.xml
#	thruster_allocation_matrix_controller/CHANGELOG.md
#	thruster_allocation_matrix_controller/package.xml
#	thruster_controllers/CHANGELOG.md
#	thruster_controllers/package.xml
#	topic_sensors/CHANGELOG.md
#	topic_sensors/package.xml
#	velocity_controllers/CHANGELOG.md
#	velocity_controllers/package.xml
#	whole_body_controllers/CHANGELOG.md
#	whole_body_controllers/package.xml
@mergify mergify bot added the conflicts label Jun 9, 2025
Copy link
Author

mergify bot commented Jun 9, 2025

Cherry-pick of 289f6e0 has failed:

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

You are currently cherry-picking commit 289f6e0.
  (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)

Changes to be committed:
	new file:   controller_coordinator/CHANGELOG.md
	new file:   controller_coordinator/CMakeLists.txt
	new file:   controller_coordinator/LICENSE
	new file:   controller_coordinator/README.md
	new file:   controller_coordinator/package.xml
	new file:   controller_coordinator/src/coordinator.cpp
	new file:   controller_coordinator/src/coordinator.hpp
	new file:   controller_coordinator/src/coordinator_parameters.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   auv_control_demos/CHANGELOG.md
	both modified:   auv_control_demos/package.xml
	deleted by us:   auv_control_msgs/CHANGELOG.md
	both modified:   auv_control_msgs/package.xml
	deleted by us:   auv_controllers/CHANGELOG.md
	both modified:   auv_controllers/package.xml
	deleted by us:   controller_common/CHANGELOG.md
	deleted by us:   controller_common/package.xml
	deleted by us:   end_effector_trajectory_controller/CHANGELOG.md
	deleted by us:   end_effector_trajectory_controller/package.xml
	deleted by us:   ik_solvers/CHANGELOG.md
	deleted by us:   ik_solvers/package.xml
	deleted by us:   thruster_allocation_matrix_controller/CHANGELOG.md
	both modified:   thruster_allocation_matrix_controller/package.xml
	deleted by us:   thruster_controllers/CHANGELOG.md
	both modified:   thruster_controllers/package.xml
	deleted by us:   topic_sensors/CHANGELOG.md
	deleted by us:   topic_sensors/package.xml
	deleted by us:   velocity_controllers/CHANGELOG.md
	both modified:   velocity_controllers/package.xml
	deleted by us:   whole_body_controllers/CHANGELOG.md
	deleted by us:   whole_body_controllers/package.xml

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

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.

1 participant