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 branch 'paintpack' into add_effect_engine

Browse Source 
Conflicts:
	libsrc/hyperion/CMakeLists.txt

Former-commit-id: c8264fed9cdf560da1621700e105b24977c58b7b
This commit is contained in:
T. van der Zwan
2013-12-12 22:06:18 +00:00
parent 155c2a0ae9 599afe675f
commit a74801a113
4 changed files with 147 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/hyperion/Hyperion.cpp
View File

@@ -23,6 +23,7 @@
#include "device/LedDeviceTest.h"
#include "device/LedDeviceWs2801.h"
#include "device/LedDeviceAdalight.h"
#include "device/LedDevicePaintpack.h"
#include "device/LedDeviceLightpack.h"
#include "device/LedDeviceMultiLightpack.h"
@@ -99,6 +100,13 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
device = deviceLightpack;
}
else if (type == "paintpack")
{
LedDevicePaintpack * devicePainLightpack = new LedDevicePaintpack();
devicePainLightpack->open();
device = devicePainLightpack;
}
else if (type == "multi-lightpack")
{
LedDeviceMultiLightpack* deviceLightpack = new LedDeviceMultiLightpack();