diff options
author | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | 2017-03-10 14:39:20 +0530 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-03-24 20:25:35 +0000 |
commit | 4fa924801a0b751d4e59c1d2fd59a8f578590088 (patch) | |
tree | 9f561aa737f89cfb1503e7ad2ce2f56e340bf1d5 /manager.cpp | |
parent | 76f58348314324aa06aac8b0cfe13c756ed58730 (diff) | |
download | phosphor-led-manager-4fa924801a0b751d4e59c1d2fd59a8f578590088.tar.gz phosphor-led-manager-4fa924801a0b751d4e59c1d2fd59a8f578590088.zip |
Use physical LED actions from generated code
Today's code returned a hardcoded string for physical LED action
and this patch uses the generated string for the passed in action enum
Fixes openbmc/phosphor-led-manager#2
Change-Id: I960e2d4346966caee526e1a0e8713e18d34b428a
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
Diffstat (limited to 'manager.cpp')
-rw-r--r-- | manager.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/manager.cpp b/manager.cpp index 0d25877..7b5791a 100644 --- a/manager.cpp +++ b/manager.cpp @@ -2,6 +2,7 @@ #include <string> #include <algorithm> #include <phosphor-logging/log.hpp> +#include <xyz/openbmc_project/Led/Physical/server.hpp> #include "manager.hpp" namespace phosphor { @@ -141,21 +142,24 @@ void Manager::drivePhysicalLED(const std::string& objPath, } /** @brief Returns action string based on enum */ -const char* const Manager::getPhysicalAction(Layout::Action action) +std::string Manager::getPhysicalAction(Layout::Action action) { - // TODO : When this is moved over to using libdus interfaces, this code will - // away. https://github.com/openbmc/phosphor-led-manager/issues/2 + namespace server = sdbusplus::xyz::openbmc_project::Led::server; + + // TODO: openbmc/phosphor-led-manager#5 + // Somehow need to use the generated Action enum than giving one + // in ledlayout. if(action == Layout::Action::On) { - return "xyz.openbmc_project.Led.Physical.Action.On"; + return server::convertForMessage(server::Physical::Action::On); } else if(action == Layout::Action::Blink) { - return "xyz.openbmc_project.Led.Physical.Action.Blink"; + return server::convertForMessage(server::Physical::Action::Blink); } else { - return "xyz.openbmc_project.Led.Physical.Action.Off"; + return server::convertForMessage(server::Physical::Action::Off); } } |