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 UR30 support (backport #899) #949

Merged
merged 4 commits into from
Apr 8, 2024
Merged

Add UR30 support (backport #899) #949

merged 4 commits into from
Apr 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 19, 2024

Resolves #898


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

(cherry picked from commit 60f26aa)

# Conflicts:
#	ur_robot_driver/test/test_common.py
@mergify mergify bot added the conflicts label Mar 19, 2024
Copy link
Author

mergify bot commented Mar 19, 2024

Cherry-pick of 60f26aa has failed:

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

You are currently cherry-picking commit 60f26aa.
  (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_moveit_config/launch/ur_moveit.launch.py
	new file:   ur_robot_driver/config/ur30_update_rate.yaml
	modified:   ur_robot_driver/doc/usage.rst
	new file:   ur_robot_driver/launch/ur30.launch.py
	modified:   ur_robot_driver/launch/ur_control.launch.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ur_robot_driver/test/test_common.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

@mergify mergify bot mentioned this pull request Mar 19, 2024
@fmauch fmauch merged commit b0267ab into iron Apr 8, 2024
7 checks passed
@fmauch fmauch deleted the mergify/bp/iron/pr-899 branch April 8, 2024 08:32
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.

3 participants