summaryrefslogtreecommitdiffstats
path: root/monitor/tach_sensor.cpp
diff options
context:
space:
mode:
authorLei YU <mine260309@gmail.com>2018-01-26 17:14:00 +0800
committerLei YU <mine260309@gmail.com>2018-02-26 10:34:14 +0800
commit8e5d197b840d4498dcb714b60cc1d38202a7a7a7 (patch)
treec08a4579fea557beda1f80023298eab22cf7e0ce /monitor/tach_sensor.cpp
parent0a9fe160d600ece0c5797741042d0e6f975ab101 (diff)
downloadphosphor-fan-presence-8e5d197b840d4498dcb714b60cc1d38202a7a7a7.tar.gz
phosphor-fan-presence-8e5d197b840d4498dcb714b60cc1d38202a7a7a7.zip
Add factor and offset for fan monitor
For fans controlled via pwm, the fan target and speed are different, where the fan target is pwm and the speed is rpm. Usually it is a linear mapping from pwm to rpm. So this commit defines the optional configs, factor and offset for calculating the expected fan speed from target, e.g. - name: fan0 has_target: true factor: 21 offset: 1600 The fan monitor service will calculate expected fan speed as: target * factor + offset The default value is 1 for factor and 0 for offset if they are not defined. Tested: Use this config together with the following commit's changes, test on Romulus and ensures the fan monitor works OK; Without this config, fan monitor always mark fans as non-functional due to the fan speed does not match the pwm value. Change-Id: If5e25368b4530df7a7face9377efb58804db21df Signed-off-by: Lei YU <mine260309@gmail.com>
Diffstat (limited to 'monitor/tach_sensor.cpp')
-rw-r--r--monitor/tach_sensor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp
index 22875a2..47f4d91 100644
--- a/monitor/tach_sensor.cpp
+++ b/monitor/tach_sensor.cpp
@@ -69,6 +69,8 @@ TachSensor::TachSensor(Mode mode,
Fan& fan,
const std::string& id,
bool hasTarget,
+ size_t factor,
+ size_t offset,
size_t timeout,
phosphor::fan::event::EventPtr& events) :
_bus(bus),
@@ -76,6 +78,8 @@ TachSensor::TachSensor(Mode mode,
_name(FAN_SENSOR_PATH + id),
_invName(path(fan.getName()) / id),
_hasTarget(hasTarget),
+ _factor(factor),
+ _offset(offset),
_timeout(timeout),
_timer(events, [this, &fan](){ fan.timerExpired(*this); })
{
OpenPOWER on IntegriCloud