Skip to content
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

Forward trajectory controller (backport #944) #1183

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

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 11, 2024

The controller should be able to forward a cartesian tracjectory to the robot for interpolation.
Creates errors on compilation due to multiple definition of functions, when inheriting from the joint_trajectory_controller. But looking at the passthrough controllers from ROS1 that may not be the right controller to use anyway?
All inputs are welcome.

closes #839


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

This adds a controller that allows sending a complete trajectory to the robot for execution.

---------

Co-authored-by: Felix Exner <[email protected]>
(cherry picked from commit ca5fb3e)

# Conflicts:
#	ur_robot_driver/config/ur_controllers.yaml
#	ur_robot_driver/launch/ur_control.launch.py
#	ur_robot_driver/scripts/example_move.py
#	ur_robot_driver/urdf/ur.ros2_control.xacro
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Nov 11, 2024
Copy link
Author

mergify bot commented Nov 11, 2024

Cherry-pick of ca5fb3e has failed:

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

You are currently cherry-picking commit ca5fb3e.
  (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:   ur_controllers/CMakeLists.txt
	modified:   ur_controllers/controller_plugins.xml
	modified:   ur_controllers/doc/index.rst
	new file:   ur_controllers/include/ur_controllers/passthrough_trajectory_controller.hpp
	modified:   ur_controllers/package.xml
	new file:   ur_controllers/src/passthrough_trajectory_controller.cpp
	new file:   ur_controllers/src/passthrough_trajectory_controller_parameters.yaml
	modified:   ur_robot_driver/CMakeLists.txt
	modified:   ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
	modified:   ur_robot_driver/launch/ur10.launch.py
	modified:   ur_robot_driver/launch/ur10e.launch.py
	modified:   ur_robot_driver/launch/ur16e.launch.py
	modified:   ur_robot_driver/launch/ur20.launch.py
	modified:   ur_robot_driver/launch/ur3.launch.py
	modified:   ur_robot_driver/launch/ur30.launch.py
	modified:   ur_robot_driver/launch/ur3e.launch.py
	modified:   ur_robot_driver/launch/ur5.launch.py
	modified:   ur_robot_driver/launch/ur5e.launch.py
	modified:   ur_robot_driver/src/hardware_interface.cpp
	new file:   ur_robot_driver/test/integration_test_controller_switch.py
	modified:   ur_robot_driver/test/robot_driver.py
	modified:   ur_robot_driver/test/test_common.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ur_robot_driver/config/ur_controllers.yaml
	both modified:   ur_robot_driver/launch/ur_control.launch.py
	deleted by us:   ur_robot_driver/scripts/example_move.py
	deleted by us:   ur_robot_driver/urdf/ur.ros2_control.xacro

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
Labels
conflicts humble Relevant for humble and higher ROS versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant