Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented May 4, 2025

Changes Made

This PR ports the end effector trajectory controller from Angler to this repository. The controller interpolates end effector motion plans using linear interpolation and spherical linear interpolation.

Associated Issues

Testing

Testing was done in Gazebo using Blue. The Blue documentation has been updated (in the PR that I don't feel like linking right now) to include a tutorial demonstrating how to use this feature.


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

* testing gif in readme

* format

* bleh

* Added reference to blue docs

* Cleanup folders

* implemented trajectory

* whoops

* ee controller mvp done

* added error tolerance for execution

* add controller state publishing

* fix compilation errors

* update version and changelogs

* Start implementing action server interface

* adding action server and improving logic

* updates

* controller ready for testing

* add pluginlib description

* fix pluginlib

* fix plugin registration

* reintegrate default constructor

* fix library build

* add transform to chained references in ik controller

* bug fixes

* bug fixes

* added readme

* fix slerp

* fix link to blue docs

* add changelogs

* fix ci errors and pr comments

* cleanup

* bad idea :D

(cherry picked from commit d197fc7)

# Conflicts:
#	README.md
#	auv_control_demos/CHANGELOG.md
#	auv_control_demos/package.xml
#	auv_control_msgs/CHANGELOG.md
#	auv_control_msgs/CMakeLists.txt
#	auv_control_msgs/msg/IKControllerStateStamped.msg
#	auv_control_msgs/package.xml
#	auv_controllers/CHANGELOG.md
#	auv_controllers/package.xml
#	controller_common/CHANGELOG.md
#	controller_common/include/controller_common/common.hpp
#	controller_common/package.xml
#	controller_common/src/common.cpp
#	ik_solvers/CHANGELOG.md
#	ik_solvers/include/ik_solvers/solver.hpp
#	ik_solvers/include/ik_solvers/task_priority_solver.hpp
#	ik_solvers/package.xml
#	ik_solvers/src/solver.cpp
#	ik_solvers/src/task_priority_solver.cpp
#	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/CMakeLists.txt
#	whole_body_controllers/include/whole_body_controllers/ik_controller.hpp
#	whole_body_controllers/package.xml
#	whole_body_controllers/src/ik_controller.cpp
@mergify mergify bot added the conflicts label May 4, 2025
@mergify
Copy link
Author

mergify bot commented May 4, 2025

Cherry-pick of d197fc7 has failed:

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

You are currently cherry-picking commit d197fc7.
  (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:   auv_control_msgs/action/FollowEndEffectorTrajectory.action
	new file:   auv_control_msgs/msg/EndEffectorTrajectory.msg
	new file:   auv_control_msgs/msg/EndEffectorTrajectoryControllerState.msg
	new file:   auv_control_msgs/msg/EndEffectorTrajectoryPoint.msg
	new file:   end_effector_trajectory_controller/CMakeLists.txt
	new file:   end_effector_trajectory_controller/LICENSE
	new file:   end_effector_trajectory_controller/README.md
	new file:   end_effector_trajectory_controller/end_effector_trajectory_controller.xml
	new file:   end_effector_trajectory_controller/include/end_effector_trajectory_controller/end_effector_trajectory_controller.hpp
	new file:   end_effector_trajectory_controller/include/end_effector_trajectory_controller/trajectory.hpp
	new file:   end_effector_trajectory_controller/package.xml
	new file:   end_effector_trajectory_controller/src/end_effector_trajectory_controller.cpp
	new file:   end_effector_trajectory_controller/src/end_effector_trajectory_controller_parameters.yaml
	new file:   end_effector_trajectory_controller/src/trajectory.cpp
	new file:   media/teleop.gif
	new file:   media/uvms.gif

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   README.md
	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/CMakeLists.txt
	deleted by us:   auv_control_msgs/msg/IKControllerStateStamped.msg
	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/include/controller_common/common.hpp
	deleted by us:   controller_common/package.xml
	deleted by us:   controller_common/src/common.cpp
	deleted by us:   ik_solvers/CHANGELOG.md
	deleted by us:   ik_solvers/include/ik_solvers/solver.hpp
	deleted by us:   ik_solvers/include/ik_solvers/task_priority_solver.hpp
	deleted by us:   ik_solvers/package.xml
	deleted by us:   ik_solvers/src/solver.cpp
	deleted by us:   ik_solvers/src/task_priority_solver.cpp
	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/CMakeLists.txt
	deleted by us:   whole_body_controllers/include/whole_body_controllers/ik_controller.hpp
	deleted by us:   whole_body_controllers/package.xml
	deleted by us:   whole_body_controllers/src/ik_controller.cpp

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

@evan-palmer evan-palmer deleted the mergify/bp/jazzy/pr-54 branch July 17, 2025 22:44
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