Skip to content

Add support for UR7e and UR12e (backport #1320) #1332

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 4, 2025
Merged

Add support for UR7e and UR12e (backport #1320) #1332

merged 1 commit into from
Apr 4, 2025

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 4, 2025

This requires UniversalRobots/Universal_Robots_ROS2_Description#266.

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

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Apr 4, 2025
@mergify
Copy link
Author

mergify bot commented Apr 4, 2025

Cherry-pick of d168696 has failed:

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

You are currently cherry-picking commit d168696.
  (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:   README.md
	modified:   ur_robot_driver/doc/usage/startup.rst
	new file:   ur_robot_driver/launch/ur12e.launch.py
	new file:   ur_robot_driver/launch/ur7e.launch.py
	modified:   ur_robot_driver/test/test_common.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ur_moveit_config/launch/ur_moveit.launch.py
	both modified:   ur_robot_driver/launch/ur_control.launch.py
	deleted by us:   ur_robot_driver/launch/ur_rsp.launch.py
	deleted by us:   ur_robot_driver/urdf/ur.urdf.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-1320 branch from 9ee21dd to cff84ba Compare April 4, 2025 06:56
@urfeex urfeex removed the conflicts label Apr 4, 2025
@urfeex urfeex merged commit 5ba9b5c into humble Apr 4, 2025
7 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1320 branch April 4, 2025 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@urfeex urfeex urfeex approved these changes

Assignees

No one assigned

Labels

humble Relevant for humble and higher ROS versions

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@urfeex