Skip to content

Conversation

URJala
Copy link
Collaborator

@URJala URJala commented Feb 29, 2024

Also added service to get robot software version.

@URJala
Copy link
Collaborator Author

URJala commented Feb 29, 2024

This requires changes from PR.
This implements the feature requested in #897

@URJala
Copy link
Collaborator Author

URJala commented Apr 11, 2024

Split this pull request into two. This PR now only implements the tool contact functionality and testing of that (Will only work on E-series robots). The get_version service implementation has been moved to PR.

@URJala URJala force-pushed the tool_contact branch 2 times, most recently from 64d0b35 to d825856 Compare July 10, 2024 13:36
@URJala URJala requested a review from fmauch July 10, 2024 13:37
@fmauch
Copy link
Contributor

fmauch commented Oct 18, 2024

I've tested this today and while it seems to be working well, I think the interface should be improved:

  • The functionality should go to its own controller
  • The controller should be implemented as a chainable controller such that
    • It can be chained after a passthrough trajectory controller (see Forward trajectory controller #944)
    • When chained activating tool contact detection should be done automatically
    • Tool contact should be acknowledged automatically when the trajectory finished
  • When used standalone it should provide an action.

@urfeex urfeex requested review from urfeex and removed request for fmauch November 14, 2024 09:20
@urfeex urfeex linked an issue Nov 14, 2024 that may be closed by this pull request
5 tasks
@URJala URJala marked this pull request as draft January 7, 2025 13:10
Copy link

codecov bot commented Jan 7, 2025

Codecov Report

Attention: Patch coverage is 0% with 292 lines in your changes missing coverage. Please review.

Project coverage is 5.07%. Comparing base (1b121b7) to head (0d1fb3b).
Report is 420 commits behind head on main.

Files with missing lines Patch % Lines
ur_controllers/src/tool_contact_controller.cpp 0.00% 203 Missing ⚠️
ur_robot_driver/src/hardware_interface.cpp 0.00% 87 Missing ⚠️
...include/ur_controllers/tool_contact_controller.hpp 0.00% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##            main    #940      +/-   ##
========================================
+ Coverage   3.59%   5.07%   +1.48%     
========================================
  Files         13      33      +20     
  Lines        947    3430    +2483     
  Branches     152     421     +269     
========================================
+ Hits          34     174     +140     
- Misses       843    3254    +2411     
+ Partials      70       2      -68     
Flag Coverage Δ
unittests 5.07% <0.00%> (+1.48%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

…till untested.

I have not done anything with starting and stopping the controller yet.
@urfeex
Copy link
Member

urfeex commented Mar 19, 2025

@URJala I gave that a try yesterday and I think the failing tests indicate some unstable state handling in the controller. Could you please have another look that the tests are all succeeding?

@urfeex urfeex changed the title Added service to enable and disable tool contact Added controller to enable and disable tool contact Apr 8, 2025
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.

This looks and behaves fine now.

@urfeex urfeex merged commit f1863a2 into UniversalRobots:main Apr 8, 2025
10 of 12 checks passed
mergify bot pushed a commit that referenced this pull request Apr 8, 2025
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
urfeex pushed a commit that referenced this pull request Apr 15, 2025
#1337)

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

* Only append to start_modes in prepare_switch
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.

Add support for using the Tool contact in the ROS2 driver

3 participants