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 'HEAD' of https://github.com/tvdzwan/hyperion.git

Browse Source 
Former-commit-id: a5e2aa216f14a7916ce4c36fa958baf3d80608a2
This commit is contained in:
T. van der Zwan
2013-11-12 06:34:00 +00:00
parent 15ee87ad29 5c71e626c7
commit 5225f1149a
11 changed files with 109 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/hyperion/Hyperion.cpp
View File

@@ -17,6 +17,7 @@
#include "device/LedDeviceSedu.h"
#include "device/LedDeviceTest.h"
#include "device/LedDeviceWs2801.h"
#include "device/LedDeviceAdalight.h"
#include "LinearColorSmoothing.h"
@@ -61,6 +62,16 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
device = deviceSedu;
}
else if (type == "adalight")
{
const std::string output = deviceConfig["output"].asString();
const unsigned rate = deviceConfig["rate"].asInt();
LedDeviceAdalight* deviceAdalight = new LedDeviceAdalight(output, rate);
deviceAdalight->open();
device = deviceAdalight;
}
else if (type == "test")
{
const std::string output = deviceConfig["output"].asString();