commit 3484bedaf611a106eeaf418b6cede2c2e42095c8
author James Feist <james.feist@linux.intel.com> Mon Feb 25 13:28:18 2019 -0800
committer Patrick Venture <venture@google.com> Tue Feb 26 18:46:56 2019 +0000
tree b852399ccab0119f7ccccc3e477635d48da01a48
parent 75eb769d351434547899186f73ff70ae00d7934a

s/minThermalRPM/minThermalOutput

The minThermalRPM is only an RPM by the fact that
that is the units of the PID. As the PID units can
be anything, change this to minThermalOutput to allow
for different units (i.e. percent).

Change-Id: Ic53fef1159ade5a413e5d519d407947f3023d8e3
Signed-off-by: James Feist <james.feist@linux.intel.com>

pid/builder.cpp

diff --git a/pid/builder.cpp b/pid/builder.cpp
index 2a64215..2faa1cc 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -63,7 +63,7 @@
         const PIDConf& pidConfig = zi.second;
 
         auto zone = std::make_unique<PIDZone>(
-            zoneId, zoneConf->second.minThermalRpm,
+            zoneId, zoneConf->second.minThermalOutput,
             zoneConf->second.failsafePercent, mgr, modeControlBus,
             getControlPath(zi.first).c_str(), deferSignals);
 

pid/buildjson.cpp

diff --git a/pid/buildjson.cpp b/pid/buildjson.cpp
index 97f2bf0..b620439 100644
--- a/pid/buildjson.cpp
+++ b/pid/buildjson.cpp
@@ -86,7 +86,7 @@
 
         /* TODO: using at() throws a specific exception we can catch */
         id = zone["id"];
-        thisZoneConfig.minThermalRpm = zone["minThermalRpm"];
+        thisZoneConfig.minThermalOutput = zone["minThermalOutput"];
         thisZoneConfig.failsafePercent = zone["failsafePercent"];
 
         auto pids = zone["pids"];

pid/zone.cpp

diff --git a/pid/zone.cpp b/pid/zone.cpp
index 065e6d7..7433d30 100644
--- a/pid/zone.cpp
+++ b/pid/zone.cpp
@@ -87,7 +87,7 @@
 
 double PIDZone::getMinThermalRPMSetpoint(void) const
 {
-    return _minThermalRpmSetPt;
+    return _minThermalOutputSetPt;
 }
 
 void PIDZone::addFanPID(std::unique_ptr<Controller> pid)

pid/zone.hpp

diff --git a/pid/zone.hpp b/pid/zone.hpp
index 077d272..94082e9 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -43,11 +43,12 @@
 class PIDZone : public ZoneInterface, public ModeObject
 {
   public:
-    PIDZone(int64_t zone, double minThermalRpm, double failSafePercent,
+    PIDZone(int64_t zone, double minThermalOutput, double failSafePercent,
             const SensorManager& mgr, sdbusplus::bus::bus& bus,
             const char* objPath, bool defer) :
         ModeObject(bus, objPath, defer),
-        _zoneId(zone), _maximumRPMSetPt(), _minThermalRpmSetPt(minThermalRpm),
+        _zoneId(zone), _maximumRPMSetPt(),
+        _minThermalOutputSetPt(minThermalOutput),
         _failSafePercent(failSafePercent), _mgr(mgr)
     {
 #ifdef __TUNING_LOGGING__
@@ -104,7 +105,7 @@
     const int64_t _zoneId;
     double _maximumRPMSetPt = 0;
     bool _manualMode = false;
-    const double _minThermalRpmSetPt;
+    const double _minThermalOutputSetPt;
     const double _failSafePercent;
 
     std::set<std::string> _failSafeSensors;