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 a sensor for the TCP pose (backport #197) #208

Merged
merged 2 commits into from
Oct 27, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 10, 2024

This is part of making the TCP pose available inside ROS.


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

Copy link
Author

mergify bot commented Oct 10, 2024

Cherry-pick of ea0c6b5 has failed:

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

You are currently cherry-picking commit ea0c6b5.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   urdf/inc/ur_sensors.xacro

no changes added to commit (use "git add" and/or "git commit -a")

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

* Add a sensor for the TCP pose

* Use quaternion notation for rotation state interfaces

(cherry picked from commit ea0c6b5)

# Conflicts:
#	urdf/inc/ur_sensors.xacro
@fmauch fmauch force-pushed the mergify/bp/humble/pr-197 branch from f4550ea to 3699835 Compare October 27, 2024 18:23
@fmauch fmauch removed the conflicts label Oct 27, 2024
@fmauch fmauch merged commit 79a1851 into humble Oct 27, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-197 branch October 27, 2024 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant