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

[iron] Bugfix for incorrect playback rate changes when pressing buttons (backport #1513) #1514

Merged
merged 2 commits into from Dec 16, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 16, 2023

This is an automatic backport of pull request #1513 done by Mergify.
Cherry-pick of 95f78b6 has failed:

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

You are currently cherry-picking commit 95f78b6.
  (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:   rosbag2_transport/test/rosbag2_transport/test_keyboard_controls.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_transport/src/rosbag2_transport/player.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

- Playback rate expected to be changed by 10% with each
increase/decrease step.
- Use +0.1 and -0.1 in decrease/increase rate formula instead of
multiply by factor of the 1.1 and 0.9 respectively.

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
(cherry picked from commit 95f78b6)

# Conflicts:
#	rosbag2_transport/src/rosbag2_transport/player.cpp
@mergify mergify bot requested a review from a team as a code owner December 16, 2023 00:18
@mergify mergify bot added the conflicts label Dec 16, 2023
@mergify mergify bot requested review from MichaelOrlov and hidmic and removed request for a team December 16, 2023 00:18
@MichaelOrlov MichaelOrlov changed the title Bugfix for incorrect playback rate changes when pressing buttons (backport #1513) [iron] Bugfix for incorrect playback rate changes when pressing buttons (backport #1513) Dec 16, 2023
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
@MichaelOrlov
Copy link
Contributor

Gist: https://gist.githubusercontent.com/MichaelOrlov/2aac7c06e1123651d21198e57fa71bea/raw/79dde56c860b5a2688407533bbff39c8fcd29701/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_transport rosbag2_tests
TEST args: --packages-above rosbag2_transport rosbag2_tests
ROS Distro: iron
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/13051

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@MichaelOrlov MichaelOrlov merged commit e53e937 into iron Dec 16, 2023
14 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/iron/pr-1513 branch December 16, 2023 23:49
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.

None yet

1 participant