From cc941e150007d56b2d7f2fc0c8248e6d74dd659d Mon Sep 17 00:00:00 2001 From: Emily Shaffer Date: Wed, 14 Jun 2017 13:06:26 -0700 Subject: sensorhandler: support setting analog sensors Refactor YAML format to denote mutability of sensors. Sensors which expect different formats for reads and writes should present two entries in the sensor YAML, one with the read interface and one with the write interface. Sensors which share a format for both reads and writes may present only one entry in the YAML with both readable and writable enums specified. If a sensor receives a write which has an interface of Sensor.Value, the "Set" message is sent via DBus to the path provided in the YAML. The previous codepath is maintained. Change-Id: I292f95b6fe936de759fd65ce72c842a1bfe66448 Signed-off-by: Emily Shaffer Signed-off-by: Patrick Venture --- sensordatahandler.hpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'sensordatahandler.hpp') diff --git a/sensordatahandler.hpp b/sensordatahandler.hpp index 68a122d..ca82666 100644 --- a/sensordatahandler.hpp +++ b/sensordatahandler.hpp @@ -95,6 +95,42 @@ ipmi_ret_t readingAssertion(const SetSensorReadingReq& cmdData, return updateToDbus(msg); } +/** @brief Update d-bus based on a discrete reading + * @param[in] cmdData - input sensor data + * @param[in] sensorInfo - sensor d-bus info + * @return an IPMI error code + */ +template +ipmi_ret_t readingData(const SetSensorReadingReq& cmdData, + const Info& sensorInfo) +{ + auto msg = makeDbusMsg( + "org.freedesktop.DBus.Properties", + sensorInfo.sensorPath, + "Set", + sensorInfo.sensorInterface); + + const auto& interface = sensorInfo.propertyInterfaces.begin(); + msg.append(interface->first); + + ipmi::sensor::Multiplier m = sensorInfo.coefficientM; + if (0 == m) + { + m = 1; // Avoid * 0 + } + + // TODO: Refactor this into a generated function depending on the type + // of conversion for the value between IPMI and dbus. + T raw_value = (m * cmdData.reading) + sensorInfo.scaledOffset; + + for (const auto& property : interface->second) + { + msg.append(property.first); + sdbusplus::message::variant value = raw_value; + msg.append(value); + } + return updateToDbus(msg); +} /** @brief Update d-bus based on eventdata type sensor data * @param[in] cmdData - input sensor data -- cgit v1.2.1