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

joint_state_broadcaster to use realtime tools (backport #308) #359

Merged
merged 3 commits into from
Jun 6, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 31, 2022

This is an automatic backport of pull request #308 done by Mergify.
Cherry-pick of 1363baf has failed:

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

You are currently cherry-picking commit 1363baf.
  (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:   joint_state_broadcaster/CMakeLists.txt
	modified:   joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
	modified:   joint_state_broadcaster/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_state_broadcaster/src/joint_state_broadcaster.cpp
	both modified:   joint_state_broadcaster/test/test_joint_state_broadcaster.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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 May 31, 2022
@bmagyar bmagyar changed the title Foxy: joint_state_broadcaster to use realtime tools (backport #308) joint_state_broadcaster to use realtime tools (backport #308) May 31, 2022
zultron and others added 2 commits June 1, 2022 07:10
* joint_state_broadcaster to use realtime tools (#276)

* Use RealtimePublisher for joint_states

* Use RealtimePublisher for dynamic joint states

* Formatting fixes for CI

Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
(cherry picked from commit 1363baf)
@bmagyar bmagyar force-pushed the mergify/bp/galactic/pr-308 branch from 3d1a709 to a1a5053 Compare June 1, 2022 06:46
@bmagyar
Copy link
Member

bmagyar commented Jun 1, 2022

@zultron could you please give this a quick check?

@bmagyar bmagyar removed the conflicts label Jun 1, 2022
@bmagyar bmagyar merged commit a43a51f into galactic Jun 6, 2022
@bmagyar bmagyar deleted the mergify/bp/galactic/pr-308 branch June 6, 2022 14:33
sp-sophia-labs pushed a commit to sp-sophia-labs/ros2_controllers that referenced this pull request Nov 8, 2022
…s#308) (ros-controls#359)

Co-authored-by: John Morris <john@zultron.com>
Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
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