Skip to content

Freedrive Controller (backport #1114) - #1211

Merged
urfeex merged 1 commit into
humblefrom
mergify/bp/humble/pr-1114
Dec 18, 2024
Merged

Freedrive Controller (backport #1114)#1211
urfeex merged 1 commit into
humblefrom
mergify/bp/humble/pr-1114

Conversation

@mergify

@mergify mergify Bot commented Dec 18, 2024

Copy link
Copy Markdown

The PR aims at introducing the possibility of enabling the freedrive mode through the ROS2 driver. It relies on the implementation of a specific controller to handle it, in order to correctly deactivate other controllers and avoid unsafe jumps of the robot once the freedrive mode is switched off.


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

@mergify mergify Bot added the conflicts label Dec 18, 2024
@mergify

mergify Bot commented Dec 18, 2024

Copy link
Copy Markdown
Author

Cherry-pick of 8d4ba94 has failed:

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

You are currently cherry-picking commit 8d4ba94.
  (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/freedrive_mode_controller.hpp
	new file:   ur_controllers/src/freedrive_mode_controller.cpp
	new file:   ur_controllers/src/freedrive_mode_controller_parameters.yaml
	new file:   ur_controllers/test/freedrive_mode_controller_params.yaml
	new file:   ur_controllers/test/test_load_freedrive_mode_controller.cpp
	modified:   ur_robot_driver/config/ur_controllers.yaml
	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/launch/ur_control.launch.py
	modified:   ur_robot_driver/test/integration_test_controller_switch.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_robot_driver/doc/usage/controllers.rst
	both modified:   ur_robot_driver/src/hardware_interface.cpp
	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

@mergify mergify Bot mentioned this pull request Dec 18, 2024
@urfeex
urfeex force-pushed the mergify/bp/humble/pr-1114 branch from 6893578 to 2ca4af5 Compare December 18, 2024 10:07
@urfeex
urfeex self-requested a review December 18, 2024 10:07
@urfeex urfeex removed the conflicts label Dec 18, 2024
This controller allows activating freedrive mode by continuously publishing an a topic

(cherry picked from commit 8d4ba94)

# Conflicts:
#	ur_robot_driver/doc/usage/controllers.rst
#	ur_robot_driver/src/hardware_interface.cpp
#	ur_robot_driver/urdf/ur.ros2_control.xacro
@urfeex
urfeex force-pushed the mergify/bp/humble/pr-1114 branch from 2ca4af5 to ea51982 Compare December 18, 2024 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants