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

Update the launch file to work with modern joy. (backport #52) #54

Merged
merged 1 commit into from
Sep 6, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 6, 2024

It should use "device_id" (not "dev") as the parameter, and the parameter should be a number, not a path (this is effectively the SDL device number, which is cross-platform).


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

Copy link
Author

mergify bot commented Sep 6, 2024

Cherry-pick of e4856e4 has failed:

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

You are currently cherry-picking commit e4856e4.
  (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:   launch/teleop-launch.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

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

It should use "device_id" (not "dev") as the parameter,
and the parameter should be a number, not a path (this is
effectively the SDL device number, which is cross-platform).

Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit e4856e4)

# Conflicts:
#	README.md
@clalancette clalancette merged commit a372c9a into iron Sep 6, 2024
3 checks passed
@clalancette clalancette deleted the mergify/bp/iron/pr-52 branch September 6, 2024 18:20
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.

1 participant