Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 23, 2023

This is an automatic backport of pull request #491 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

* Use the same variables for state feedback and PID loop

* Make joint_error normalization configurable

* Activate test for only velocity controller

* Allow ff_velocity_scale=0 without deprecated warning

* Add test for setpoint due to normalized position error

* Update comments in test

Co-authored-by: Bence Magyar <[email protected]>
(cherry picked from commit 67e5d4d)
@bmagyar bmagyar merged commit 8e6697b into humble Apr 23, 2023
@bmagyar bmagyar deleted the mergify/bp/humble/pr-491 branch April 23, 2023 20:28
@fmauch
Copy link
Contributor

fmauch commented Apr 26, 2023

Just as a note: This seems to be breaking the scaled JTC from ur_controllers. When using the humble branch one commit back everything works, with 8e6697b we get a segfault from our scaled JTC's update function. However, I'm not sure whether this is related or if we have a problem somewhere else, that just shows now by accident.

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.

4 participants