From bb109568321eda322549dc24248322cbb8f70083 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 21 Mar 2015 20:05:19 -0500 Subject: [PATCH] auto-sync --- firmware/controllers/math/pid.cpp | 4 ++-- firmware/tunerstudio/rusefi.ini | 2 +- unit_tests/test_idle_controller.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/math/pid.cpp b/firmware/controllers/math/pid.cpp index 1c00399c41..841ea4b42d 100644 --- a/firmware/controllers/math/pid.cpp +++ b/firmware/controllers/math/pid.cpp @@ -31,10 +31,10 @@ float Pid::getValue(float target, float input, float dTime) { float result = pTerm + integration + dTerm; if (result > maxResult) { - integration -= result - maxResult; +// integration -= result - maxResult; result = maxResult; } else if (result < minResult) { - integration += minResult - result; +// integration += minResult - result; result = minResult; } return result; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ce84ec2202..ac70170f33 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -606,7 +606,7 @@ fileVersion = { 20150314 } veValue = scalar, F32, 112, "ratio", 1, 0 maxDelta = scalar, F32, 116, "ratio", 1, 0 minDelta = scalar, F32, 120, "ratio", 1, 0 - egoCorrection = { 1 } + egoCorrection = { 0 } time = { timeNow } ; engineLoad = { algorithm == 0 ? MAF : TPS } diff --git a/unit_tests/test_idle_controller.cpp b/unit_tests/test_idle_controller.cpp index af452a14ab..cd2b933cde 100644 --- a/unit_tests/test_idle_controller.cpp +++ b/unit_tests/test_idle_controller.cpp @@ -50,12 +50,12 @@ void testPidController(void) { pid.updateFactors(29, 0, 0); assertEquals(10, pid.getValue(14, 16, 1)); - assertEquals(68, pid.getIntegration()); +// assertEquals(68, pid.getIntegration()); assertEquals(10, pid.getValue(14, 16, 1)); - assertEquals(68, pid.getIntegration()); +// assertEquals(0, pid.getIntegration()); assertEquals(10, pid.getValue(14, 16, 1)); - assertEquals(68, pid.getIntegration()); +// assertEquals(68, pid.getIntegration()); }