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 an option to publish TwistStamped (backport #42) #46

Merged
merged 3 commits into from
Jun 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 11, 2024

Similar to ros-teleop/teleop_tools#54, this PR adds an option publish_stamped_twist to publish TwistStamped for /cmd_vel topic. This PR also adds a parameter for frame_id for its header.

I didn't change the default type for now.


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

Signed-off-by: Tamaki Nishino <[email protected]>
(cherry picked from commit 76cd650)

# Conflicts:
#	README.md
#	src/teleop_twist_joy.cpp
Copy link
Author

mergify bot commented Jun 11, 2024

Cherry-pick of 76cd650 has failed:

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

You are currently cherry-picking commit 76cd650.
  (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:   CMakeLists.txt
	modified:   launch/teleop-launch.py
	new file:   test/publish_stamped_twist_joy_launch_test.py
	modified:   test/test_joy_twist.py

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

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 requested a review from ahcorde as a code owner June 11, 2024 10:59
@mergify mergify bot added the conflicts label Jun 11, 2024
@mergify mergify bot requested a review from clalancette as a code owner June 11, 2024 10:59
@ahcorde ahcorde merged commit e5842bf into iron Jun 17, 2024
2 of 3 checks passed
@mergify mergify bot deleted the mergify/bp/iron/pr-42 branch June 17, 2024 11:34
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.

2 participants