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

Hyperion Switcher + cleanup (#423)

Browse Source 
* upd

* update

* update

* update schemachecker

* ...

* fix lowest priority

* zeroconf updates (#421) (#3)

* zeroconf:
add ip
make names more uniq

* tune dns name for webconfig

* update

* update

* update

* update ui

* ...

* min val for gamma

* lost somewhere this

* add status to hyperion object

* update ui
This commit is contained in:
brindosch
2017-03-24 10:17:36 +01:00
committed by GitHub
parent c6fa40fa87
commit 8e12d189b0
25 changed files with 253 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/hyperion/Hyperion.cpp
View File

@@ -401,7 +401,6 @@ Hyperion::Hyperion(const QJsonObject &qjsonConfig, const QString configFile)
, _bonjourBrowser(this)
, _bonjourResolver(this)
{
registerPriority("Off", PriorityMuxer::LOWEST_PRIORITY);
if (!_raw2ledAdjustment->verifyAdjustments())
{
@@ -779,16 +778,13 @@ void Hyperion::update()
_ledBuffer.reserve(_hwLedCount);
_ledBuffer = priorityInfo.ledColors;
if ( priority < PriorityMuxer::LOWEST_PRIORITY)
if (priorityInfo.componentId != _prevCompId)
{
if (priorityInfo.componentId != _prevCompId)
{
bool backlightEnabled = (priorityInfo.componentId != hyperion::COMP_COLOR && priorityInfo.componentId != hyperion::COMP_EFFECT);
_raw2ledAdjustment->setBacklightEnabled(backlightEnabled);
_prevCompId = priorityInfo.componentId;
}
_raw2ledAdjustment->applyAdjustment(_ledBuffer);
bool backlightEnabled = (priorityInfo.componentId != hyperion::COMP_COLOR && priorityInfo.componentId != hyperion::COMP_EFFECT);
_raw2ledAdjustment->setBacklightEnabled(backlightEnabled);
_prevCompId = priorityInfo.componentId;
}
_raw2ledAdjustment->applyAdjustment(_ledBuffer);
// init colororder vector, if empty
if (_ledStringColorOrder.empty())

2
libsrc/hyperion/PriorityMuxer.cpp
View File

@@ -78,7 +78,7 @@ void PriorityMuxer::clearAll()
{
for(auto key : _activeInputs.keys())
{
if (key < LOWEST_PRIORITY-1)
if (key < LOWEST_PRIORITY)
{
_activeInputs.remove(key);
}

23
libsrc/hyperion/schemas/hyperion.schema-2.json
View File

@@ -14,7 +14,9 @@
{
"type" : "string",
"title" : "edt_conf_gen_name_title",
"default" : "MyHyperionConfig",
"default" : "My Hyperion Config",
"minLength" : 4,
"maxLength" : 20,
"required" : true,
"propertyOrder" : 1
},
@@ -685,7 +687,7 @@
"type" : "integer",
"title" : "edt_conf_general_priority_title",
"minimum" : 100,
"maximum" : 253,
"maximum" : 254,
"default" : 250,
"propertyOrder" : 5
},
@@ -780,12 +782,11 @@
},
"threshold" :
{
"type" : "number",
"type" : "integer",
"title" : "edt_conf_bb_threshold_title",
"minimum" : 0.0,
"maximum" : 1.0,
"default" : 0.05,
"step" : 0.01,
"minimum" : 0,
"maximum" : 100,
"default" : 5,
"append" : "edt_append_percent",
"propertyOrder" : 2
},
@@ -1128,8 +1129,8 @@
"type" : "integer",
"title" : "edt_conf_general_priority_title",
"minimum" : 100,
"maximum" : 253,
"default" : 200,
"maximum" : 254,
"default" : 201,
"propertyOrder" : 3
}
},
@@ -1169,8 +1170,8 @@
"type" : "integer",
"title" : "edt_conf_general_priority_title",
"minimum" : 100,
"maximum" : 253,
"default" : 190,
"maximum" : 254,
"default" : 200,
"propertyOrder" : 4
},
"timeout" :