Skip to content

Disable pose broadcaster on mock hardware (backport #1229) #1230

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

Merged
merged 3 commits into from
Jan 14, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 13, 2025

Related to #1228


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

As mock hardware doesn't send the same pose information as the real robot does, it does make sense to not start it in mock hardware.

(cherry picked from commit 79252cf)

# Conflicts:
#	ur_robot_driver/launch/ur_control.launch.py
@mergify mergify bot added the conflicts label Jan 13, 2025
Copy link
Author

mergify bot commented Jan 13, 2025

Cherry-pick of 79252cf has failed:

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

You are currently cherry-picking commit 79252cf.
  (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 <file>..." to mark resolution)
	both modified:   ur_robot_driver/launch/ur_control.launch.py

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

Copy link
Member

@urfeex urfeex left a comment

Choose a reason for hiding this comment

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

lgtm

@urfeex urfeex removed the conflicts label Jan 14, 2025
@urfeex urfeex merged commit 588aa30 into humble Jan 14, 2025
6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-1229 branch January 14, 2025 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants