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

Allow to disable switching LEDs on during startup (#1443)

Browse Source
This commit is contained in:
LordGrey
2022-03-16 09:27:37 +01:00
committed by GitHub
parent c75c98e252
commit 62829d9bf8
6 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/hyperion/schema/schema-device.json
View File

@@ -29,6 +29,18 @@
},
"access": "expert",
"propertyOrder": 3
},
"autoStart": {
"type": "boolean",
"format": "checkbox",
"title": "edt_dev_general_autostart_title",
"default": true,
"required": true,
"options": {
"infoText": "edt_dev_general_autostart_title_info"
},
"access": "advanced",
"propertyOrder": 4
}
},
"dependencies": {

31
libsrc/leddevice/LedDevice.cpp
View File

@@ -16,6 +16,22 @@
#include <sstream>
#include <iomanip>
// Constants
namespace {
// Configuration settings
const char CONFIG_CURRENT_LED_COUNT[] = "currentLedCount";
const char CONFIG_COLOR_ORDER[] = "colorOrder";
const char CONFIG_AUTOSTART[] = "autoStart";
const char CONFIG_LATCH_TIME[] = "latchTime";
const char CONFIG_REWRITE_TIME[] = "rewriteTime";
int DEFAULT_LED_COUNT = 1;
const char DEFAULT_COLOR_ORDER[] = "RGB";
const bool DEFAULT_IS_AUTOSTART = true;
} //End of constants
LedDevice::LedDevice(const QJsonObject& deviceConfig, QObject* parent)
: QObject(parent)
, _devConfig(deviceConfig)
@@ -34,6 +50,7 @@ LedDevice::LedDevice(const QJsonObject& deviceConfig, QObject* parent)
, _isInSwitchOff (false)
, _lastWriteTime(QDateTime::currentDateTime())
, _isRefreshEnabled (false)
, _isAutoStart(true)
{
_activeDeviceType = deviceConfig["type"].toString("UNSPECIFIED").toLower();
}
@@ -64,7 +81,10 @@ void LedDevice::start()
{
// Everything is OK -> enable device
_isDeviceInitialised = true;
this->enable();
if (_isAutoStart)
{
this->enable();
}
}
}
@@ -147,11 +167,12 @@ bool LedDevice::init(const QJsonObject &deviceConfig)
{
Debug(_log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData() );
_colorOrder = deviceConfig["colorOrder"].toString("RGB");
_colorOrder = deviceConfig[CONFIG_COLOR_ORDER].toString(DEFAULT_COLOR_ORDER);
_isAutoStart = deviceConfig[CONFIG_AUTOSTART].toBool(DEFAULT_IS_AUTOSTART);
setLedCount( deviceConfig["currentLedCount"].toInt(1) ); // property injected to reflect real led count
setLatchTime( deviceConfig["latchTime"].toInt( _latchTime_ms ) );
setRewriteTime ( deviceConfig["rewriteTime"].toInt( _refreshTimerInterval_ms) );
setLedCount( deviceConfig[CONFIG_CURRENT_LED_COUNT].toInt(DEFAULT_LED_COUNT) ); // property injected to reflect real led count
setLatchTime( deviceConfig[CONFIG_LATCH_TIME].toInt( _latchTime_ms ) );
setRewriteTime ( deviceConfig[CONFIG_REWRITE_TIME].toInt( _refreshTimerInterval_ms) );
return true;
}