diff options
| -rw-r--r-- | pid/builder.cpp | 2 | ||||
| -rw-r--r-- | pid/zone.cpp | 2 | ||||
| -rw-r--r-- | pid/zone.hpp | 2 | ||||
| -rw-r--r-- | test/pid_zone_unittest.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
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 @@ std::unordered_map<int64_t, std::unique_ptr<PIDZone>> 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) 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 @@ bool PIDZone::getFailSafeMode(void) const return !_failSafeSensors.empty(); } -int64_t PIDZone::getZoneId(void) const +int64_t PIDZone::getZoneID(void) const { return _zoneId; } 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 @@ class PIDZone : public ZoneInterface, public ModeObject */ 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; 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 @@ TEST_F(PidZoneTest, GetZoneId_ReturnsExpected) { // Verifies the zoneId returned is what we expect. - EXPECT_EQ(zoneId, zone->getZoneId()); + EXPECT_EQ(zoneId, zone->getZoneID()); } TEST_F(PidZoneTest, GetAndSetManualModeTest_BehavesAsExpected) |
