Skip to content

[Pid] Save i_term instead of error integral (backport #294) #389

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 2 commits into from
Jun 7, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 7, 2025

The internal state should be the i_term to avoid jumps in the output while tuning the integral gain. Reverts #33

With constant gains, this PR does not change the current behavior of output calculation. Only the field in the published message and the result of get_current_pid_errors will be changed.

I got confused of the message definition, because it has some duplicates:
ros-controls/control_msgs#173
If yes, let's fix that in a new PR.


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

(cherry picked from commit 37a12e8)

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

mergify bot commented Jun 7, 2025

Cherry-pick of 37a12e8 has failed:

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

You are currently cherry-picking commit 37a12e8.
  (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/include/control_toolbox/pid.hpp
	modified:   control_toolbox/include/control_toolbox/pid_ros.hpp
	modified:   control_toolbox/src/pid_ros.cpp
	modified:   control_toolbox/test/pid_tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

When we already break ABI with #386, then let's backport this also

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 88.88889% with 1 line in your changes missing coverage. Please review.

Project coverage is 74.98%. Comparing base (ee359df) to head (c953258).

Files with missing lines Patch % Lines
control_toolbox/src/pid_ros.cpp 66.66% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            jazzy     #389      +/-   ##
==========================================
- Coverage   74.98%   74.98%   -0.01%     
==========================================
  Files          29       29              
  Lines        1391     1387       -4     
  Branches       86       85       -1     
==========================================
- Hits         1043     1040       -3     
  Misses        298      298              
+ Partials       50       49       -1     
Flag Coverage Δ
unittests 74.98% <88.88%> (-0.01%) ⬇️

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

Files with missing lines Coverage Δ
control_toolbox/include/control_toolbox/pid.hpp 77.77% <ø> (ø)
...ontrol_toolbox/include/control_toolbox/pid_ros.hpp 100.00% <ø> (ø)
control_toolbox/src/pid.cpp 81.00% <100.00%> (+0.23%) ⬆️
control_toolbox/test/pid_tests.cpp 100.00% <ø> (ø)
control_toolbox/src/pid_ros.cpp 62.84% <66.66%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich merged commit f9881af into jazzy Jun 7, 2025
10 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-294 branch June 7, 2025 20:17
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