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) #930

Merged
merged 4 commits into from
Apr 8, 2024
Merged

Add UR30 support (backport #899) #930

merged 4 commits into from
Apr 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 14, 2024

This is an automatic backport of pull request #899 done by Mergify.
Cherry-pick of 60f26aa has failed:

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

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:   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)
	both modified:   README.md
	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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 14, 2024
@mergify mergify bot mentioned this pull request Feb 14, 2024
@VinDp
Copy link
Collaborator

VinDp commented Feb 14, 2024

Related to #128

Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VinDp please remove the unrelated test_common.py file from this PR.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that file does not belong into this PR.

fmauch and others added 3 commits March 18, 2024 11:40
(cherry picked from commit 60f26aa)

# Conflicts:
#	README.md
#	ur_robot_driver/test/test_common.py
@fmauch fmauch merged commit 9e83413 into humble Apr 8, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-899 branch April 8, 2024 07:04
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.

None yet

2 participants