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

impl options explanation, uiLock (#343)

Browse Source 
* update schemas

* update

* killed upstream change

* min prio is now 100

* reset watchdog regularly

* update

* fix

* update
This commit is contained in:
brindosch
2016-12-21 18:24:03 +01:00
committed by GitHub
parent 0414e3c860
commit 88bed79c07
34 changed files with 879 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/hyperion/ImageProcessor.cpp
View File

@@ -81,7 +81,7 @@ QString ImageProcessor::mappingTypeToStr(int mappingType)
if (mappingType == 1 )
return "unicolor_mean";
return "mulicolor_mean";
return "multicolor_mean";
}
bool ImageProcessor::getScanParameters(size_t led, double &hscanBegin, double &hscanEnd, double &vscanBegin, double &vscanEnd) const

8
libsrc/hyperion/hyperion.schema.json
View File

@@ -501,7 +501,7 @@
"priority" :
{
"type" : "integer",
"minimum" : 2,
"minimum" : 100,
"maximum" : 2000000000,
"title" : "edt_conf_general_priority_title",
"default" : 900,
@@ -687,7 +687,7 @@
{
"type" : "integer",
"title" : "edt_conf_general_priority_title",
"minimum" : 2,
"minimum" : 100,
"maximum" : 2000000000,
"default" : 890
},
@@ -1045,7 +1045,7 @@
{
"type" : "integer",
"title" : "edt_conf_general_priority_title",
"minimum" : 2,
"minimum" : 100,
"maximum" : 2000000000,
"default" : 800,
"propertyOrder" : 3
@@ -1086,7 +1086,7 @@
{
"type" : "integer",
"title" : "edt_conf_general_priority_title",
"minimum" : 2,
"minimum" : 100,
"maximum" : 2000000000,
"default" : 800,
"propertyOrder" : 4

6
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -486,9 +486,9 @@ void JsonClientConnection::handleCreateEffectCommand(const QJsonObject& message,
if (effectArray.size() > 0)
{
if (message["name"].toString().trimmed().isEmpty())
if (message["name"].toString().trimmed().isEmpty() || message["name"].toString().trimmed().startsWith("."))
{
sendErrorReply("Can't save new effect. Effect name is empty", command, tan);
sendErrorReply("Can't save new effect. Effect name is empty or begins with a dot.", command, tan);
return;
}
@@ -625,6 +625,7 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
}
info["priorities"] = priorities;
info["priorities_autoselect"] = _hyperion->sourceAutoSelectEnabled();
// collect transform information
QJsonArray transformArray;
@@ -836,7 +837,6 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
}
info["components"] = component;
info["components_autoselect"] = _hyperion->sourceAutoSelectEnabled();
info["ledMAppingType"] = ImageProcessor::mappingTypeToStr(_hyperion->getLedMappingType());
// Add Hyperion Version, build time