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

feat: override_timestamps_with_wall_time parameter (backport #562) #584

Merged
merged 2 commits into from
Aug 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2024

🎉 New feature

Closes #546

Summary

Stamp all outgoing headers with the wall time if parameter override_timestamps_with_wall_time is set to true.

Test it

Start the bridge with the additional parameter override_timestamps_with_wall_time set to true. Note that the outgoing messages have the wall time stamp and not the gazebo time stamp.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.


This is an automatic backport of pull request #562 done by [Mergify](https://mergify.com).

…imestamps_with_wall_time is set to true (#562)

Signed-off-by: Rein Appeldoorn <[email protected]>
(cherry picked from commit 6daea2c)

# Conflicts:
#	ros_gz_bridge/src/factory.hpp
Copy link
Contributor Author

mergify bot commented Aug 1, 2024

Cherry-pick of 6daea2c has failed:

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

You are currently cherry-picking commit 6daea2c.
  (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:   ros_gz_bridge/README.md
	modified:   ros_gz_bridge/src/bridge_handle.cpp
	modified:   ros_gz_bridge/src/bridge_handle.hpp
	modified:   ros_gz_bridge/src/bridge_handle_gz_to_ros.cpp
	modified:   ros_gz_bridge/src/factory_interface.hpp
	modified:   ros_gz_bridge/src/ros_gz_bridge.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros_gz_bridge/src/factory.hpp

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 August 1, 2024 09:38
@mergify mergify bot added the conflicts label Aug 1, 2024
@reinzor
Copy link
Contributor

reinzor commented Aug 20, 2024

@ahcorde @azeey could you resolve the conflicts for this PR. I have no write-rights to this branch. Or do you want me to submit another PR?

@ahcorde
Copy link
Collaborator

ahcorde commented Aug 20, 2024

@ahcorde @azeey could you resolve the conflicts for this PR. I have no write-rights to this branch. Or do you want me to submit another PR?

you can open a PR against mergify/bp/jazzy/pr-562

@reinzor
Copy link
Contributor

reinzor commented Aug 20, 2024

@ahcorde @azeey could you resolve the conflicts for this PR. I have no write-rights to this branch. Or do you want me to submit another PR?

you can open a PR against mergify/bp/jazzy/pr-562

#590

Signed-off-by: Rein Appeldoorn <[email protected]>
@ahcorde ahcorde merged commit 7aab274 into jazzy Aug 29, 2024
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-562 branch August 29, 2024 14:06
@reinzor
Copy link
Contributor

reinzor commented Aug 29, 2024

Thanks!

@Timple
Copy link

Timple commented Oct 11, 2024

It seems a new release was created just before this was merged.

Would it be possible to kick off a new jazzy release?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants