Fix thresholds not found
Due to the same attribute name "thresholds" in class 'ADCSensor' and
'Sensor', the function hasWarningInterface use this parameter from class
ADCSensor and cause it can not found the correct thresholds.
Rename the "thresholds" to "thresholdsIn" to avoid this problem.
Tested: Add thresholds to adc, cpu, hwmon and fan sensor and verify pass.
Signed-off-by: Jeff Lin <JeffLin2@quantatw.com>
Change-Id: I6a8a5f7036dd9f195a7848ff03fa5f51966c2d2d
diff --git a/src/ExternalSensor.cpp b/src/ExternalSensor.cpp
index c19ec40..c6db174 100644
--- a/src/ExternalSensor.cpp
+++ b/src/ExternalSensor.cpp
@@ -21,16 +21,16 @@
const std::string& objectType, sdbusplus::asio::object_server& objectServer,
std::shared_ptr<sdbusplus::asio::connection>& conn,
const std::string& sensorName, const std::string& sensorUnits,
- std::vector<thresholds::Threshold>&& thresholds,
+ std::vector<thresholds::Threshold>&& thresholdsIn,
const std::string& sensorConfiguration, const double& maxReading,
const double& minReading, const PowerState& powerState) :
// TODO(): When the Mutable feature is integrated,
// make sure all ExternalSensor instances are mutable,
// because that is the entire point of ExternalSensor,
// to accept sensor values written by an external source.
- Sensor(boost::replace_all_copy(sensorName, " ", "_"), std::move(thresholds),
- sensorConfiguration, objectType, maxReading, minReading, conn,
- powerState),
+ Sensor(boost::replace_all_copy(sensorName, " ", "_"),
+ std::move(thresholdsIn), sensorConfiguration, objectType, maxReading,
+ minReading, conn, powerState),
std::enable_shared_from_this<ExternalSensor>(), objServer(objectServer)
{
// The caller must specify what physical characteristic