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 'upstream/master/master' into prio_cleanup

Browse Source 
Conflicts:
	config/hyperion.config.json

Former-commit-id: 7f6fd562b78a6c4b646d9f1587941265b2ca12e0
This commit is contained in:
redpanther
2016-03-09 07:09:20 +01:00
parent e6170ed698 14fc1d9bb6
commit eb64cc6601
9 changed files with 354 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libsrc/leddevice/LedDeviceFactory.cpp
View File

@@ -129,8 +129,9 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
{
const std::string output = deviceConfig["output"].asString();
const unsigned rate = deviceConfig["rate"].asInt();
const unsigned latchtime = deviceConfig.get("latchtime",500000).asInt();
LedDeviceWs2801* deviceWs2801 = new LedDeviceWs2801(output, rate);
LedDeviceWs2801* deviceWs2801 = new LedDeviceWs2801(output, rate, latchtime);
deviceWs2801->open();
device = deviceWs2801;

7
libsrc/leddevice/LedDeviceWs2801.cpp
View File

@@ -18,6 +18,13 @@ LedDeviceWs2801::LedDeviceWs2801(const std::string& outputDevice, const unsigned
// empty
}
LedDeviceWs2801::LedDeviceWs2801(const std::string& outputDevice, const unsigned baudrate, const unsigned latchTime) :
LedSpiDevice(outputDevice, baudrate, latchTime),
mLedCount(0)
{
// empty
}
int LedDeviceWs2801::write(const std::vector<ColorRgb> &ledValues)
{
mLedCount = ledValues.size();

4
libsrc/leddevice/LedDeviceWs2801.h
View File

@@ -21,6 +21,10 @@ public:
LedDeviceWs2801(const std::string& outputDevice,
const unsigned baudrate);
LedDeviceWs2801(const std::string& outputDevice,
const unsigned baudrate,
const unsigned latchTime);
///
/// Writes the led color values to the led-device
///