Support to accumulate PWM of different controllers for same sensor
Description:
1. Add one property: accumulateSetPoint in zone of fan table that could
be used to enable accumulation of output PWM of different controllers
with same sensor.
2. Add one property: checkHysterWithSetpt in pid info of fan table to
select to compare current input and setpoint to check hysteresis.
3. The purpose of accumulate the stepwise output and PID output for
one sensor is that the setting of stepwise could use to prevent
the fan speed from suddenly increasing from a very low speed to a
very high speed due to reaching the setpoint.
Use stepwise before setpoint could also keep the PWM steady at
low ambient temperature.
Design:
1. Search "accumulateSetPoint" field in fan table.
If the value was true, accumulate the output PWM of different
controllers with same profile name.
2. Support two method to calculate PID output that could be chosen by
setting the "checkHysterWithSetpt" to true in pid info of fan table.
If the flag was set to true, it won't calculate PWM output if the
input lower than setpoint.
Test Case:
1. Check the output PWM of different controllers with same profile
name could be accumulated - pass.
2. Set "checkHysterWithSetpt" to true and check PID output would not be
calculated if the input temperature was lower than setpoint - pass.
Please see more details in gist:
https://gist.github.com/DelphineCCChiu/a6170d3e1a12fc4ee76fad324382fba3
Change-Id: I9f38f250d72545784c6c11be2fde7d45f0b385c4
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
diff --git a/pid/buildjson.cpp b/pid/buildjson.cpp
index dd7d2a3..57fabbf 100644
--- a/pid/buildjson.cpp
+++ b/pid/buildjson.cpp
@@ -66,12 +66,18 @@
*/
auto p = j.at("pid");
+ auto checkHysterWithSetpt = p.find("checkHysterWithSetpt");
auto positiveHysteresis = p.find("positiveHysteresis");
auto negativeHysteresis = p.find("negativeHysteresis");
auto derivativeCoeff = p.find("derivativeCoeff");
+ auto checkHysterWithSetptValue = false;
auto positiveHysteresisValue = 0.0;
auto negativeHysteresisValue = 0.0;
auto derivativeCoeffValue = 0.0;
+ if (checkHysterWithSetpt != p.end())
+ {
+ checkHysterWithSetpt->get_to(checkHysterWithSetptValue);
+ }
if (positiveHysteresis != p.end())
{
positiveHysteresis->get_to(positiveHysteresisValue);
@@ -113,6 +119,7 @@
c.pidInfo.positiveHysteresis = positiveHysteresisValue;
c.pidInfo.negativeHysteresis = negativeHysteresisValue;
c.pidInfo.derivativeCoeff = derivativeCoeffValue;
+ c.pidInfo.checkHysterWithSetpt = checkHysterWithSetptValue;
}
else
{
@@ -213,6 +220,14 @@
getCycleTimeSetting(zone, id, "updateThermalsTimeMS",
thisZoneConfig.cycleTime.updateThermalsTimeMS);
+ bool accumulateSetPoint = false;
+ auto findAccSetPoint = zone.find("accumulateSetPoint");
+ if (findAccSetPoint != zone.end())
+ {
+ findAccSetPoint->get_to(accumulateSetPoint);
+ }
+ thisZoneConfig.accumulateSetPoint = accumulateSetPoint;
+
auto pids = zone["pids"];
for (const auto& pid : pids)
{