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

Fix #676 (#679) LedDevice Open() did not initialised the device correctly.

Browse Source 
* Cast fix
* Fix #676
This commit is contained in:
LordGrey
2020-02-14 21:58:10 +01:00
committed by GitHub
parent ed5455458b
commit 0fa5a24cec
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libsrc/leddevice/LedDevice.cpp
View File

@@ -40,8 +40,19 @@ LedDevice::~LedDevice()
int LedDevice::open()
{
setEnable (true);
return 0;
int retval = -1;
QString errortext;
_deviceReady = false;
// General initialisation and configuration of LedDevice
if ( init(_devConfig) )
{
// Everything is OK -> enable device
_deviceReady = true;
setEnable(true);
retval = 0;
}
return retval;
}
void LedDevice::setInError(const QString& errorMsg)
@@ -71,6 +82,11 @@ void LedDevice::setEnable(bool enable)
Error(_log, "Device '%s' cannot be enabled, as it is not ready!", QSTRING_CSTR(_activeDeviceType));
return;
}
else
{
// Open worked
_deviceInError = false;
}
}
// emit signal when state changed
@@ -101,6 +117,8 @@ void LedDevice::setActiveDeviceType(const QString& deviceType)
bool LedDevice::init(const QJsonObject &deviceConfig)
{
//Debug(_log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData() );
_colorOrder = deviceConfig["colorOrder"].toString("RGB");
_activeDeviceType = deviceConfig["type"].toString("file").toLower();
setLedCount(static_cast<unsigned int>( deviceConfig["currentLedCount"].toInt(1) )); // property injected to reflect real led count
@@ -146,7 +164,7 @@ void LedDevice::stopRefreshTimer()
int LedDevice::updateLeds(const std::vector<ColorRgb>& ledValues)
{
int retval = 0;
if ( !_deviceReady )
if ( !_deviceReady || _deviceInError)
{
std::cout << "LedDevice::updateLeds(), LedDevice NOT ready!" << std::endl;
return -1;