Skip to content

Small improvement in remapping (backport #393)#724

Merged
bmagyar merged 1 commit intohumblefrom
mergify/bp/humble/pr-393
Aug 1, 2023
Merged

Small improvement in remapping (backport #393)#724
bmagyar merged 1 commit intohumblefrom
mergify/bp/humble/pr-393

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 31, 2023

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


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

Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
(cherry picked from commit cc4c221)
@bmagyar bmagyar merged commit e5b99ab into humble Aug 1, 2023
@bmagyar bmagyar deleted the mergify/bp/humble/pr-393 branch August 1, 2023 15:25
bmagyar pushed a commit that referenced this pull request Aug 5, 2023
* Small improvement in remapping (#393) (#724)

* Fix file name for include guard (backport #681)

(cherry picked from commit c619aac)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>

* Activate AdmittanceControllerTestParameterizedInvalidParameters (#711) (#733)

* [JTC] Re-enabling test, bugfixing and hardening. Adding a parameter to define when trajectories with non-zero velocity at the end are used. (backport #705) (#706)

* Add state_publish_rate parameter

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.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