From c3bd109a99036fa1055a59b2fe2fd4f448156a42 Mon Sep 17 00:00:00 2001 From: "T. van der Zwan" Date: Tue, 17 Dec 2013 19:07:57 +0000 Subject: [PATCH] Disabled the ws2811 (for now) Former-commit-id: db2028ab7e588dd88ea5966b15b4f5e2657e79e9 --- libsrc/leddevice/LedDeviceFactory.cpp | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libsrc/leddevice/LedDeviceFactory.cpp b/libsrc/leddevice/LedDeviceFactory.cpp index e745d7e9..9adcac6a 100644 --- a/libsrc/leddevice/LedDeviceFactory.cpp +++ b/libsrc/leddevice/LedDeviceFactory.cpp @@ -32,23 +32,23 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig) device = deviceWs2801; } - else if (type == "ws2811") - { - const std::string output = deviceConfig["output"].asString(); - const std::string outputSpeed = deviceConfig["output"].asString(); - const std::string timingOption = deviceConfig["timingOption"].asString(); +// else if (type == "ws2811") +// { +// const std::string output = deviceConfig["output"].asString(); +// const std::string outputSpeed = deviceConfig["output"].asString(); +// const std::string timingOption = deviceConfig["timingOption"].asString(); - ws2811::SpeedMode speedMode = (outputSpeed == "high")? ws2811::highspeed : ws2811::lowspeed; - if (outputSpeed != "high" && outputSpeed != "low") - { - std::cerr << "Incorrect speed-mode selected for WS2811: " << outputSpeed << " != {'high', 'low'}" << std::endl; - } +// ws2811::SpeedMode speedMode = (outputSpeed == "high")? ws2811::highspeed : ws2811::lowspeed; +// if (outputSpeed != "high" && outputSpeed != "low") +// { +// std::cerr << "Incorrect speed-mode selected for WS2811: " << outputSpeed << " != {'high', 'low'}" << std::endl; +// } - LedDeviceWs2811 * deviceWs2811 = new LedDeviceWs2811(output, ws2811::fromString(timingOption, ws2811::option_2855), speedMode); - deviceWs2811->open(); +// LedDeviceWs2811 * deviceWs2811 = new LedDeviceWs2811(output, ws2811::fromString(timingOption, ws2811::option_2855), speedMode); +// deviceWs2811->open(); - device = deviceWs2811; - } +// device = deviceWs2811; +// } else if (type == "lpd6803" || type == "ldp6803") { const std::string output = deviceConfig["output"].asString();