rename away from RPM
The SetPoint output from a thermal PID is likely RPM, and that value is
then fed into a fan controller PID as the set-point (unit: RPM). This
does not have to be RPM, however. Continue renaming variables and
methods to remove the explicit unit-naming.
Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I570dee0c688338f9a458cac7123314717bee2b42
diff --git a/pid/zone.cpp b/pid/zone.cpp
index 47d6695..6a63671 100644
--- a/pid/zone.cpp
+++ b/pid/zone.cpp
@@ -35,9 +35,9 @@
using tstamp = std::chrono::high_resolution_clock::time_point;
using namespace std::literals::chrono_literals;
-double PIDZone::getMaxRPMRequest(void) const
+double PIDZone::getMaxSetPointRequest(void) const
{
- return _maximumRPMSetPt;
+ return _maximumSetPoint;
}
bool PIDZone::getManualMode(void) const
@@ -86,7 +86,7 @@
return _failSafePercent;
}
-double PIDZone::getMinThermalRPMSetpoint(void) const
+double PIDZone::getMinThermalSetpoint(void) const
{
return _minThermalOutputSetPt;
}
@@ -116,7 +116,7 @@
_thermalInputs.push_back(therm);
}
-void PIDZone::determineMaxRPMRequest(void)
+void PIDZone::determineMaxSetPointRequest(void)
{
double max = 0;
std::vector<double>::iterator result;
@@ -137,7 +137,7 @@
* If the maximum RPM setpoint output is below the minimum RPM
* setpoint, set it to the minimum.
*/
- max = std::max(getMinThermalRPMSetpoint(), max);
+ max = std::max(getMinThermalSetpoint(), max);
if (tuningEnabled)
{
@@ -167,7 +167,7 @@
}
}
- _maximumRPMSetPt = max;
+ _maximumSetPoint = max;
return;
}
@@ -223,7 +223,7 @@
_log << std::chrono::duration_cast<std::chrono::milliseconds>(
now.time_since_epoch())
.count();
- _log << "," << _maximumRPMSetPt;
+ _log << "," << _maximumSetPoint;
}
for (const auto& f : _fanInputs)