Skip to content

Update auv_control_demos configurations (backport #60) #61

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 3, 2025

Changes Made

This addresses a few issues with the auv_control_demos package. The configurations haven't been updated recently and the documentation was stale. This PR brings this package back up to date.

Associated Issues

Testing

Tested running demos in devcontainer while following tutorial steps.


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

* Fixed stale demos

* Update package versions

* Fix obsolete tf2 header

(cherry picked from commit c8d798e)

# Conflicts:
#	auv_control_demos/CHANGELOG.md
#	auv_control_demos/chained_controllers/README.md
#	auv_control_demos/individual_controller/README.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/include/end_effector_trajectory_controller/end_effector_trajectory_controller.hpp
#	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 3, 2025
Copy link
Author

mergify bot commented Jun 3, 2025

Cherry-pick of c8d798e has failed:

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

You are currently cherry-picking commit c8d798e.
  (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:
	modified:   .vscode/settings.json
	modified:   auv_control_demos/chained_controllers/config/chained_controllers.yaml
	modified:   auv_control_demos/chained_controllers/launch/chaining.launch.py
	renamed:    auv_control_demos/chained_controllers/xacro/chained_config.xacro -> auv_control_demos/chained_controllers/xacro/chained.config.xacro
	new file:   auv_control_demos/chained_controllers/xacro/chained.model.xacro
	renamed:    auv_control_demos/chained_controllers/xacro/chained_ros2_control.xacro -> auv_control_demos/chained_controllers/xacro/chained.ros2_control.xacro
	new file:   auv_control_demos/chained_controllers/xacro/chained.urdf.xacro
	deleted:    auv_control_demos/chained_controllers/xacro/chained_urdf.xacro
	modified:   auv_control_demos/individual_controller/config/individual_controller.yaml
	modified:   auv_control_demos/individual_controller/launch/individual.launch.py
	renamed:    auv_control_demos/individual_controller/xacro/individual_config.xacro -> auv_control_demos/individual_controller/xacro/individual.config.xacro
	new file:   auv_control_demos/individual_controller/xacro/individual.model.xacro
	renamed:    auv_control_demos/individual_controller/xacro/individual_ros2_control.xacro -> auv_control_demos/individual_controller/xacro/individual.ros2_control.xacro
	renamed:    auv_control_demos/individual_controller/xacro/individual_urdf.xacro -> auv_control_demos/individual_controller/xacro/individual.urdf.xacro
	new file:   end_effector_trajectory_controller/CHANGELOG.md

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/chained_controllers/README.md
	both modified:   auv_control_demos/individual_controller/README.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/include/end_effector_trajectory_controller/end_effector_trajectory_controller.hpp
	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