Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented May 28, 2025

Before, we were using a RPY notation. Changing that to an angle-axis notation should fix things.

This should fix #1375

@bsolon-tri would you like to try that locally?

I want to add a test checking further orientations and an updated example before merging this, but testing things locally seem to have resolved the issue.


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

* [force mode controller] Fix the task frame orientation

Before, we were using a RPY notation. Chaning that to an angle-axis
notation should fix things.

* Update force_mode example to include a pose that is not in line with one of the main axes

* Make test use an arbitraty orientation

This should avoid a coincitental overlap if the transformation is wrong.

(cherry picked from commit 8eb4288)

# Conflicts:
#	ur_robot_driver/test/integration_test_force_mode.py
@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels May 28, 2025
@mergify
Copy link
Author

mergify bot commented May 28, 2025

Cherry-pick of 8eb4288 has failed:

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

You are currently cherry-picking commit 8eb4288.
  (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/src/force_mode_controller.cpp
	modified:   ur_robot_driver/examples/force_mode.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/test/integration_test_force_mode.py

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

Before, we were using a RPY notation. Chaning that to an angle-axis
notation should fix things.

* Update force_mode example to include a pose that is not in line with one of the main axes

* Make test use an arbitraty orientation

This should avoid a coincitental overlap if the transformation is wrong.

(cherry picked from commit 8eb4288)

# Conflicts:
#	ur_robot_driver/test/integration_test_force_mode.py
@urfeex urfeex removed the conflicts label Jun 2, 2025
@urfeex urfeex merged commit 4db741e into humble Jun 2, 2025
7 of 8 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1379 branch June 2, 2025 15:56
u-decs pushed a commit to u-decs/Universal_Robots_ROS2_Driver that referenced this pull request Jun 17, 2025
…ersalRobots#1379) (UniversalRobots#1380)

Before, we were using a RPY notation. Chaning that to an angle-axis
notation should fix things.

* Update force_mode example to include a pose that is not in line with one of the main axes

* Make test use an arbitraty orientation

This should avoid a coincitental overlap if the transformation is wrong.

(cherry picked from commit 8eb4288)

# Conflicts:
#	ur_robot_driver/test/integration_test_force_mode.py

* [force mode controller] Fix the task frame orientation (UniversalRobots#1379)

Before, we were using a RPY notation. Chaning that to an angle-axis
notation should fix things.

* Update force_mode example to include a pose that is not in line with one of the main axes

* Make test use an arbitraty orientation

This should avoid a coincitental overlap if the transformation is wrong.

(cherry picked from commit 8eb4288)

# Conflicts:
#	ur_robot_driver/test/integration_test_force_mode.py

---------

Co-authored-by: Felix Exner <feex@universal-robots.com>
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.

1 participant