mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
LED Device Features, Fixes and Refactoring (Resubmit PR855) (#875)
* Refactor LedDevices - Initial version * Small renamings * Add WLED as own device * Lpd8806 Remove open() method * remove dependency on Qt 5.10 * Lpd8806 Remove open() method * Update WS281x * Update WS2812SPI * Add writeBlack for WLED powerOff * WLED remove extra bracket * Allow different Nanoleaf panel numbering sequence (Feature req.#827) * build(deps): bump websocket-extensions from 0.1.3 to 0.1.4 in /docs (#826) * Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) * Fix typos * Nanoleaf clean-up * Yeelight support, generalize wizard elements * Update Yeelight to handle quota in music mode * Yeelight extend rage for extraTimeDarkness for testing * Clean-up - Add commentary, Remove development debug statements * Fix brightnessSwitchOffOnMinimum typo and default value * Yeelight support restoreOriginalState, additional Fixes * WLED - Remove UDP-Port, as it is not configurable * Fix merging issue * Remove QHostAddress::operator=(const QString&)' is deprecated * Windows compile errors and (Qt 5.15 deprecation) warnings * Fix order includes * LedDeviceFile Support Qt5.7 and greater * Windows compatibility and other Fixes * Fix Qt Version compatability * Rs232 - Resolve portname from unix /dev/ style, fix DMX sub-type support * Disable WLED Wizard Button (until Wizard is available) * Yeelight updates * Add wrong log-type as per #505 * Fixes and Clean-up after clang-tidy report * Fix udpe131 not enabled for generated CID * Change timer into dynamic for Qt Thread-Affinity * Hue clean-up and diyHue workaround * Updates after review feedback by m-seker * Add "chrono" includes
This commit is contained in:
@@ -13,7 +13,9 @@ LedDevicePiBlaster::LedDevicePiBlaster(const QJsonObject &deviceConfig)
|
||||
: _fid(nullptr)
|
||||
{
|
||||
_devConfig = deviceConfig;
|
||||
_deviceReady = false;
|
||||
_isDeviceReady = false;
|
||||
|
||||
_activeDeviceType = deviceConfig["type"].toString("UNSPECIFIED").toLower();
|
||||
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
|
||||
@@ -55,7 +57,7 @@ bool LedDevicePiBlaster::init(const QJsonObject &deviceConfig)
|
||||
return false;
|
||||
}
|
||||
|
||||
// walk through the json config and populate the mapping tables
|
||||
// walk through the JSON configuration and populate the mapping tables
|
||||
for(QJsonArray::const_iterator gpioArray = gpioMapping.begin(); gpioArray != gpioMapping.end(); ++gpioArray)
|
||||
{
|
||||
const QJsonObject value = (*gpioArray).toObject();
|
||||
@@ -84,56 +86,57 @@ int LedDevicePiBlaster::open()
|
||||
{
|
||||
int retval = -1;
|
||||
QString errortext;
|
||||
_deviceReady = false;
|
||||
_isDeviceReady = false;
|
||||
|
||||
if ( init(_devConfig) )
|
||||
if (_fid != nullptr)
|
||||
{
|
||||
if (_fid != nullptr)
|
||||
// The file pointer is already open
|
||||
errortext = QString ("Device (%1) is already open.").arg(_deviceName);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!QFile::exists(_deviceName))
|
||||
{
|
||||
// The file pointer is already open
|
||||
errortext = QString ("Device (%1) is already open.").arg(_deviceName);
|
||||
errortext = QString ("The device (%1) does not yet exist.").arg(_deviceName);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!QFile::exists(_deviceName))
|
||||
_fid = fopen(QSTRING_CSTR(_deviceName), "w");
|
||||
if (_fid == nullptr)
|
||||
{
|
||||
errortext = QString ("The device (%1) does not yet exist.").arg(_deviceName);
|
||||
errortext = QString ("Failed to open device (%1). Error message: %2").arg(_deviceName, strerror(errno));
|
||||
}
|
||||
else
|
||||
{
|
||||
_fid = fopen(QSTRING_CSTR(_deviceName), "w");
|
||||
if (_fid == nullptr)
|
||||
{
|
||||
errortext = QString ("Failed to open device (%1). Error message: %2").arg(_deviceName, strerror(errno));
|
||||
}
|
||||
else
|
||||
{
|
||||
Info( _log, "Connected to device(%s)", QSTRING_CSTR(_deviceName));
|
||||
retval = 0;
|
||||
setEnable(true);
|
||||
}
|
||||
Info( _log, "Connected to device(%s)", QSTRING_CSTR(_deviceName));
|
||||
|
||||
// Everything is OK, device is ready
|
||||
_isDeviceReady = true;
|
||||
retval = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( retval < 0 )
|
||||
{
|
||||
this->setInError( errortext );
|
||||
}
|
||||
// On error/exceptions, set LedDevice in error
|
||||
if ( retval < 0 )
|
||||
{
|
||||
this->setInError( errortext );
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
void LedDevicePiBlaster::close()
|
||||
int LedDevicePiBlaster::close()
|
||||
{
|
||||
LedDevice::close();
|
||||
int retval = 0;
|
||||
_isDeviceReady = false;
|
||||
|
||||
// LedDevice specific closing activites
|
||||
// Close the device (if it is opened)
|
||||
// Test, if device requires closing
|
||||
if (_fid != nullptr)
|
||||
{
|
||||
fclose(_fid);
|
||||
_fid = nullptr;
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
int LedDevicePiBlaster::write(const std::vector<ColorRgb> & ledValues)
|
||||
|
Reference in New Issue
Block a user