diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-12-13 13:36:36 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-12-13 13:36:36 +0200 |
| commit | dd8771c870ca1130b86f76e3b9c4e83cd50e5f26 (patch) | |
| tree | 9f7504c3cded54b8553faee66ae01025aea74c91 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 9c7f5ee1554c97f34eb7fa6478b918bcad7b7bde (diff) | |
| parent | 83483b721876c87151ffd73b1aa3d73a9fabc339 (diff) | |
| download | Tango-dd8771c870ca1130b86f76e3b9c4e83cd50e5f26.tar.gz Tango-dd8771c870ca1130b86f76e3b9c4e83cd50e5f26.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c index 72774461a..f9aee7929 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c @@ -52,8 +52,6 @@ float AdvancedPIDAlgorithmCalculation(float _setPoint,float _mesuredParam , PID_ } derivative = (error - *_pre_error)/params->dt; - float IntegralErrorMultiplier; - float ProportionalErrorMultiplier; output = params->Kp*error/params->ProportionalErrorMultiplier + params->Ki**_integral/params->IntegralErrorMultiplier + params->Kd*derivative; |