Skip to content

Redefine the antiwindup strategy and their parameters interfacing (backport #400) #410

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

Merged
merged 3 commits into from
Jun 17, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 17, 2025

Second PR for the antiwindup strategy integration


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

(cherry picked from commit 910093d)

# Conflicts:
#	control_toolbox/include/control_toolbox/pid.hpp
#	control_toolbox/include/control_toolbox/pid_ros.hpp
#	control_toolbox/src/pid.cpp
@mergify mergify bot added the conflicts label Jun 17, 2025
Copy link
Author

mergify bot commented Jun 17, 2025

Cherry-pick of 910093d has failed:

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

You are currently cherry-picking commit 910093d.
  (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:   control_toolbox/src/pid_ros.cpp
	modified:   control_toolbox/test/pid_ros_parameters_tests.cpp
	modified:   control_toolbox/test/pid_ros_publisher_tests.cpp
	modified:   control_toolbox/test/pid_tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   control_toolbox/include/control_toolbox/pid.hpp
	both modified:   control_toolbox/include/control_toolbox/pid_ros.hpp
	both modified:   control_toolbox/src/pid.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@codecov-commenter
Copy link

codecov-commenter commented Jun 17, 2025

Codecov Report

Attention: Patch coverage is 76.94444% with 83 lines in your changes missing coverage. Please review.

Project coverage is 76.78%. Comparing base (d7284f5) to head (79f06f9).

Files with missing lines Patch % Lines
control_toolbox/src/pid_ros.cpp 66.03% 32 Missing and 4 partials ⚠️
control_toolbox/src/pid.cpp 66.66% 18 Missing and 6 partials ⚠️
control_toolbox/include/control_toolbox/pid.hpp 68.49% 19 Missing and 4 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            jazzy     #410      +/-   ##
==========================================
+ Coverage   74.95%   76.78%   +1.83%     
==========================================
  Files          29       29              
  Lines        1801     1943     +142     
  Branches      107      113       +6     
==========================================
+ Hits         1350     1492     +142     
+ Misses        389      379      -10     
- Partials       62       72      +10     
Flag Coverage Δ
unittests 76.78% <76.94%> (+1.83%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...ontrol_toolbox/include/control_toolbox/pid_ros.hpp 100.00% <ø> (ø)
control_toolbox/test/pid_ros_parameters_tests.cpp 100.00% <100.00%> (ø)
control_toolbox/test/pid_ros_publisher_tests.cpp 96.15% <100.00%> (+1.15%) ⬆️
control_toolbox/test/pid_tests.cpp 100.00% <100.00%> (ø)
control_toolbox/include/control_toolbox/pid.hpp 67.28% <68.49%> (-10.98%) ⬇️
control_toolbox/src/pid.cpp 71.82% <66.66%> (+6.48%) ⬆️
control_toolbox/src/pid_ros.cpp 63.96% <66.03%> (+4.50%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich changed the title Redefine the antiwindup strategy and their parameters interfacing (backport #400) Redefine the antiwindup strategy and their parameters interfacing (backport #400, #326) Jun 17, 2025
@christophfroehlich christophfroehlich changed the title Redefine the antiwindup strategy and their parameters interfacing (backport #400, #326) Redefine the antiwindup strategy and their parameters interfacing (backport #400) Jun 17, 2025
Copy link
Author

mergify bot commented Jun 17, 2025

This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

@christophfroehlich christophfroehlich merged commit 04d4d10 into jazzy Jun 17, 2025
9 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-400 branch June 17, 2025 21:05
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.

3 participants