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

Add force mode controller (backport #1049) #1193

Merged
merged 1 commit into from
Dec 18, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 27, 2024

Added force mode arguments: damping and gain scaling to be usable with the force mode controller. damping and gain scaling will be changeable every time you start force mode when PR is implemented.
This is an update to PR


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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Nov 27, 2024
Copy link
Author

mergify bot commented Nov 27, 2024

Cherry-pick of e949995 has failed:

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

You are currently cherry-picking commit e949995.
  (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
	new file:   ur_controllers/include/ur_controllers/force_mode_controller.hpp
	modified:   ur_controllers/package.xml
	new file:   ur_controllers/src/force_mode_controller.cpp
	new file:   ur_controllers/src/force_mode_controller_parameters.yaml
	new file:   ur_controllers/test/force_mode_controller_params.yaml
	new file:   ur_controllers/test/test_load_force_mode_controller.cpp
	new file:   ur_robot_driver/examples/examples.py
	new file:   ur_robot_driver/examples/force_mode.py
	new file:   ur_robot_driver/test/integration_test_force_mode.py
	modified:   ur_robot_driver/test/test_common.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ur_controllers/controller_plugins.xml
	both modified:   ur_controllers/doc/index.rst
	both modified:   ur_robot_driver/CMakeLists.txt
	both modified:   ur_robot_driver/config/ur_controllers.yaml
	deleted by us:   ur_robot_driver/doc/usage/controllers.rst
	both modified:   ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
	both modified:   ur_robot_driver/launch/ur_control.launch.py
	both modified:   ur_robot_driver/src/hardware_interface.cpp
	deleted by us:   ur_robot_driver/test/integration_test_controller_switch.py
	both modified:   ur_robot_driver/test/robot_driver.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

@urfeex urfeex force-pushed the mergify/bp/humble/pr-1049 branch from df643a8 to 6ba196a Compare December 5, 2024 21:17
@urfeex urfeex removed the conflicts label Dec 5, 2024
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1049 branch 2 times, most recently from 62d1440 to d83243a Compare December 6, 2024 14:18
@urfeex urfeex self-requested a review December 18, 2024 07:42
This enables using the robot's force_mode in a standalone controller. Force mode can be enabled and parametrized using a service call provided by the controller.

---------

Co-authored-by: urmarp <marp@universal-robots.com>
Co-authored-by: Felix Exner <feex@universal-robots.com>
@urfeex urfeex force-pushed the mergify/bp/humble/pr-1049 branch from d83243a to 588939b Compare December 18, 2024 09:25
@urfeex urfeex merged commit fda52d5 into humble Dec 18, 2024
5 of 6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1049 branch December 18, 2024 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Relevant for humble and higher ROS versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants