summaryrefslogtreecommitdiffstats
path: root/pid
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2019-02-11 09:39:59 -0800
committerPatrick Venture <venture@google.com>2019-02-11 09:39:59 -0800
commit8e2fdb34b4338b41cb27756810266f6e3eb900ee (patch)
tree5415e65b614f130681bbefaf47fa35d85a82d42f /pid
parenta23468ef06b72ad2946e8f744c7e606435988253 (diff)
downloadphosphor-pid-control-8e2fdb34b4338b41cb27756810266f6e3eb900ee.tar.gz
phosphor-pid-control-8e2fdb34b4338b41cb27756810266f6e3eb900ee.zip
conf change: rename zone variables
Rename the zone variables to make them camelCase as a step towards making all configuration variables camelCase for consistency. Note: This patchset requires a change to your yaml configuration if you're using it, or libconfig if you're using it. Change-Id: If9cf1d7eb8227d305a1625275f2f7082c0d6905a Signed-off-by: Patrick Venture <venture@google.com>
Diffstat (limited to 'pid')
-rw-r--r--pid/builder.cpp4
-rw-r--r--pid/builderconfig.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/pid/builder.cpp b/pid/builder.cpp
index 8fef528..2a64215 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -63,8 +63,8 @@ std::unordered_map<int64_t, std::unique_ptr<PIDZone>>
const PIDConf& pidConfig = zi.second;
auto zone = std::make_unique<PIDZone>(
- zoneId, zoneConf->second.minthermalrpm,
- zoneConf->second.failsafepercent, mgr, modeControlBus,
+ zoneId, zoneConf->second.minThermalRpm,
+ zoneConf->second.failsafePercent, mgr, modeControlBus,
getControlPath(zi.first).c_str(), deferSignals);
std::cerr << "Zone Id: " << zone->getZoneID() << "\n";
diff --git a/pid/builderconfig.cpp b/pid/builderconfig.cpp
index f85e1c1..652724d 100644
--- a/pid/builderconfig.cpp
+++ b/pid/builderconfig.cpp
@@ -76,9 +76,9 @@ std::unordered_map<int64_t, std::unique_ptr<PIDZone>>
zoneSettings.lookupValue("id", id);
- thisZoneConfig.minthermalrpm = zoneSettings.lookup("minthermalrpm");
- thisZoneConfig.failsafepercent =
- zoneSettings.lookup("failsafepercent");
+ thisZoneConfig.minThermalRpm = zoneSettings.lookup("minThermalRpm");
+ thisZoneConfig.failsafePercent =
+ zoneSettings.lookup("failsafePercent");
const Setting& pids = zoneSettings["pids"];
int pidCount = pids.getLength();
OpenPOWER on IntegriCloud