control: Setup configured power on delay retrieval
A configured power on delay comes from either a compile time YAML
generated `_powerOnDelay` entry or from parsing a future manager JSON
configuration file.
Tested:
No impact to YAML driven configurations
An initial power on delay of zero when use of JSON enabled
Change-Id: If87260d1cb310a0c30698c47024127cd5e8a37e1
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/json_parser.cpp b/control/json_parser.cpp
index c43d961..9cd4f6f 100644
--- a/control/json_parser.cpp
+++ b/control/json_parser.cpp
@@ -29,4 +29,11 @@
return zoneGrps;
}
+const unsigned int getPowerOnDelay(sdbusplus::bus::bus& bus)
+{
+ auto powerOnDelay = 0;
+
+ return powerOnDelay;
+}
+
} // namespace phosphor::fan::control
diff --git a/control/json_parser.hpp b/control/json_parser.hpp
index 42a89a6..4b4801b 100644
--- a/control/json_parser.hpp
+++ b/control/json_parser.hpp
@@ -34,4 +34,15 @@
*/
const std::vector<ZoneGroup> getZoneGroups(sdbusplus::bus::bus& bus);
+/**
+ * @brief Get the delay(in seconds) to allow the fans to ramp up to the defined
+ * power on speed
+ *
+ * @param[in] bus - The dbus bus object
+ *
+ * @return Time to delay in seconds
+ * Amount of time to delay in seconds after a power on
+ */
+const unsigned int getPowerOnDelay(sdbusplus::bus::bus& bus);
+
} // namespace phosphor::fan::control
diff --git a/control/manager.cpp b/control/manager.cpp
index 9213fd7..ff8afef 100644
--- a/control/manager.cpp
+++ b/control/manager.cpp
@@ -135,13 +135,16 @@
{
z.second->setFullSpeed();
}
-#ifndef CONTROL_USE_JSON
+#ifdef CONTROL_USE_JSON
+ auto delay = getPowerOnDelay(_bus);
+#else
auto delay = _powerOnDelay;
+#endif
while (delay > 0)
{
delay = sleep(delay);
}
-#endif
+
util::SDBusPlus::callMethod(_bus, SYSTEMD_SERVICE, SYSTEMD_OBJ_PATH,
SYSTEMD_INTERFACE, "StartUnit",
FAN_CONTROL_READY_TARGET, "replace");