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

Fix diff_drive accel limit (#242) (backport #252) #257

Merged
merged 4 commits into from Oct 25, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2021

This is an automatic backport of pull request #252 done by Mergify.
Cherry-pick of 0469455 has failed:

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

You are currently cherry-picking commit 0469455.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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.io/

(cherry picked from commit 0469455)

# Conflicts:
#	diff_drive_controller/src/diff_drive_controller.cpp
@joshnewans
Copy link
Contributor

I don't know how this mergify business works, but presumably the issue here is that last_msg was renamed to last_command_msg somewhere between the foxy and galactic branches (something I had to change after making my initial fix on foxy and then cherry-picking to galactic).

@destogl
Copy link
Member

destogl commented Oct 20, 2021

@joshnewans thanks for the comment. Do you have an idea how to fix this fast? Can you propose a change directly on the files here?

@joshnewans I just guessed something. Can you check/review it, please?

Copy link
Contributor

@joshnewans joshnewans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from that one change I flagged it looks good to me.

diff_drive_controller/src/diff_drive_controller.cpp Outdated Show resolved Hide resolved
@bmagyar bmagyar merged commit 366db74 into foxy Oct 25, 2021
@bmagyar bmagyar deleted the mergify/bp/foxy/pr-252 branch October 25, 2021 17:29
gwalck pushed a commit to StoglRobotics-forks/ros2_controllers that referenced this pull request Jun 7, 2023
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

3 participants