Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 8, 2025

Also added service to get robot software version.


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

This adds a new controller to enable tool contact mode on the robot.

---------

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

# Conflicts:
#	ur_robot_driver/src/hardware_interface.cpp
#	ur_robot_driver/urdf/ur.ros2_control.xacro
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Apr 8, 2025
Copy link
Author

mergify bot commented Apr 8, 2025

Cherry-pick of f1863a2 has failed:

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

You are currently cherry-picking commit f1863a2.
  (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/tool_contact_controller.hpp
	new file:   ur_controllers/src/tool_contact_controller.cpp
	new file:   ur_controllers/src/tool_contact_controller_parameters.yaml
	modified:   ur_robot_driver/CMakeLists.txt
	modified:   ur_robot_driver/config/ur_controllers.yaml
	modified:   ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
	modified:   ur_robot_driver/launch/ur_control.launch.py
	modified:   ur_robot_driver/test/integration_test_controller_switch.py
	new file:   ur_robot_driver/test/integration_test_tool_contact.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/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

@urfeex
Copy link
Member

urfeex commented Apr 9, 2025

@URJala could you please test this again on a real robot using ROS Humble?

@urfeex urfeex requested a review from URJala April 9, 2025 07:22
urfeex added 2 commits April 15, 2025 12:32
Before the main control mode (position/velocity) was always overwriting
the complete list for the joint. That worked fine when that was the only
control mode for a joint or if it was the first in the list. But that is
not guaranteed.
Since we create the list as an empty vector beforehand, anyway, we can
simply append to that list in any case. The list will be checked for
compatibility at a later point, anyway.

# Conflicts:
#	ur_robot_driver/src/hardware_interface.cpp
Copy link
Member

@urfeex urfeex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have successfully tested this with real hardware.

@urfeex urfeex merged commit fe78fb4 into humble Apr 15, 2025
6 of 7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-940 branch April 15, 2025 13:37
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