commit 0bbeaf84e02b94ac5f94d7edb8532d06d2fda99f
author Patrick Venture <venture@google.com> Tue Oct 30 18:50:31 2018 -0700
committer Patrick Venture <venture@google.com> Tue Oct 30 18:51:28 2018 -0700
tree 1462dbf7b438a57cffb3a094d04af7bd86033df3
parent 76ce5d775c2bb31dc8214dc110c593b9ca0abd22

style: s/getZoneId/getZoneID/g

Acronyms are meant to be in the same case within their part of the camel
case name.

Change-Id: I9e55d4419617a35b0f3a85f3d55543c8fc9bd76f
Signed-off-by: Patrick Venture <venture@google.com>

pid/builder.cpp

diff --git a/pid/builder.cpp b/pid/builder.cpp
index 58ef8df..55f3e35 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -67,7 +67,7 @@
             zoneConf->second.failsafepercent, mgr, modeControlBus,
             getControlPath(zi.first).c_str(), deferSignals);
 
-        std::cerr << "Zone Id: " << zone->getZoneId() << "\n";
+        std::cerr << "Zone Id: " << zone->getZoneID() << "\n";
 
         // For each PID create a Controller and a Sensor.
         for (const auto& pit : pidConfig)

pid/zone.cpp

diff --git a/pid/zone.cpp b/pid/zone.cpp
index 2af3307..0c9718a 100644
--- a/pid/zone.cpp
+++ b/pid/zone.cpp
@@ -56,7 +56,7 @@
     return !_failSafeSensors.empty();
 }
 
-int64_t PIDZone::getZoneId(void) const
+int64_t PIDZone::getZoneID(void) const
 {
     return _zoneId;
 }

pid/zone.hpp

diff --git a/pid/zone.hpp b/pid/zone.hpp
index d2da92c..e04eeb7 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -62,7 +62,7 @@
      */
     void setManualMode(bool mode);
     bool getFailSafeMode(void) const override;
-    int64_t getZoneId(void) const;
+    int64_t getZoneID(void) const;
     void addRPMSetPoint(float setpoint) override;
     void clearRPMSetPoints(void);
     float getFailSafePercent(void) const override;

test/pid_zone_unittest.cpp

diff --git a/test/pid_zone_unittest.cpp b/test/pid_zone_unittest.cpp
index e358296..82997b9 100644
--- a/test/pid_zone_unittest.cpp
+++ b/test/pid_zone_unittest.cpp
@@ -105,7 +105,7 @@
 {
     // Verifies the zoneId returned is what we expect.
 
-    EXPECT_EQ(zoneId, zone->getZoneId());
+    EXPECT_EQ(zoneId, zone->getZoneID());
 }
 
 TEST_F(PidZoneTest, GetAndSetManualModeTest_BehavesAsExpected)