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

Browse Source 
Former-commit-id: 9d968e9388591f446e548c14ec5fcf58d1aba01b
This commit is contained in:
johan
2013-11-13 23:04:07 +01:00
parent 12c925d77f b943d8e70c
commit 6c33d55468
9 changed files with 264 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/hyperion/Hyperion.cpp
View File

@@ -14,6 +14,7 @@
#include <hyperion/ImageProcessorFactory.h>
#include "device/LedDeviceLpd6803.h"
#include "device/LedDeviceLpd8806.h"
#include "device/LedDeviceSedu.h"
#include "device/LedDeviceTest.h"
#include "device/LedDeviceWs2801.h"
@@ -48,11 +49,21 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
const std::string output = deviceConfig["output"].asString();
const unsigned rate = deviceConfig["rate"].asInt();
LedDeviceLdp6803* deviceLdp6803 = new LedDeviceLdp6803(output, rate);
LedDeviceLpd6803* deviceLdp6803 = new LedDeviceLpd6803(output, rate);
deviceLdp6803->open();
device = deviceLdp6803;
}
else if (type == "lpd8806" || type == "ldp8806")
{
const std::string output = deviceConfig["output"].asString();
const unsigned rate = deviceConfig["rate"].asInt();
LedDeviceLpd8806* deviceLpd8806 = new LedDeviceLpd8806(output, rate);
deviceLpd8806->open();
device = deviceLpd8806;
}
else if (type == "sedu")
{
const std::string output = deviceConfig["output"].asString();