frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/Beta'

Browse Source 
Former-commit-id: 5bdbda1406bb0ddb99440502584604b85b0f3063
This commit is contained in:
brindosch
2016-03-23 17:53:32 +01:00
parent fe8a92b2eb c427081ac5
commit f332473b77
8 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/leddevice/LedDeviceFactory.cpp
View File

@@ -29,7 +29,7 @@
#include "LedDevicePaintpack.h"
#include "LedDevicePiBlaster.h"
#include "LedDeviceSedu.h"
#include "LedDeviceTest.h"
#include "LedDeviceFile.h"
#include "LedDeviceFadeCandy.h"
#include "LedDeviceUdp.h"
#include "LedDeviceHyperionUsbasp.h"
@@ -275,10 +275,10 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
device = new LedDeviceAtmoOrb(output, switchOffOnBlack, transitiontime, port, numLeds, orbIds);
}
else if (type == "test")
else if (type == "file")
{
const std::string output = deviceConfig["output"].asString();
device = new LedDeviceTest(output);
const std::string output = deviceConfig.get("output", "/dev/null").asString();
device = new LedDeviceFile(output);
}
else if (type == "fadecandy")
{