frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
assets/webconfig/content/about.html
View File

@ -4,6 +4,11 @@
<div class="col-lg-6"> <div class="col-lg-6">
<div id="about_cont"></div> <div id="about_cont"></div>
</div> </div>
<div id="danger_act"class="col-lg-6" style="display:none">
<h4>You found a hidden service menu!</h4>
<button id="reset_cache" class="btn btn-danger">Reset Browser Cache</button>
<button id="hyp_restart" class="btn btn-danger">Force Hyperion Restart</button>
</div>
</div> </div>
</div> </div>
@ -14,6 +19,7 @@
var libs = {"Bootstrap 3" : "http://getbootstrap.com/", "JQuery" : "https://jquery.com/", "Bootstrap Colorpicker" : "https://itsjavi.com/bootstrap-colorpicker/", "JSON-Editor" : "http://jeremydorn.com/json-editor/", "jQuery.i18n" : "https://github.com/wikimedia/jquery.i18n", "metisMenu" : "http://mm.onokumus.com/index.html", "download.js" : "http://danml.com/download.html", "gijgo" : "http://gijgo.com/"}; var libs = {"Bootstrap 3" : "http://getbootstrap.com/", "JQuery" : "https://jquery.com/", "Bootstrap Colorpicker" : "https://itsjavi.com/bootstrap-colorpicker/", "JSON-Editor" : "http://jeremydorn.com/json-editor/", "jQuery.i18n" : "https://github.com/wikimedia/jquery.i18n", "metisMenu" : "http://mm.onokumus.com/index.html", "download.js" : "http://danml.com/download.html", "gijgo" : "http://gijgo.com/"};
var libh = ""; var libh = "";
var lang = []; var lang = [];
var dcount = 0;
for(var i = 0; i<availLang.length; i++) for(var i = 0; i<availLang.length; i++)
lang.push($.i18n('general_speech_'+availLang[i])); lang.push($.i18n('general_speech_'+availLang[i]));
@ -23,11 +29,24 @@
lang = lang.toString().replace(/,/g,", "); lang = lang.toString().replace(/,/g,", ");
var fc = [$.i18n("about_version"),$.i18n("about_build"),$.i18n("about_builddate"),$.i18n("about_translations"),$.i18n("about_resources", $.i18n("general_webui_title"))]; var fc = ['<span id="danger_trig">'+$.i18n("about_version")+'<span>',$.i18n("about_build"),$.i18n("about_builddate"),$.i18n("about_translations"),$.i18n("about_resources", $.i18n("general_webui_title"))];
var sc = [currentVersion,si.build,si.time,'('+availLang.length+')<p>'+lang+'</p><p><a href="https://hyperion-project.org/contribute/?pk_campaign=WebUI&pk_kwd=about_contribute" target="_blank">'+$.i18n("about_contribute")+'</a></p>',libh]; var sc = [currentVersion,si.build,si.time,'('+availLang.length+')<p>'+lang+'</p><p><a href="https://hyperion-project.org/contribute/?pk_campaign=WebUI&pk_kwd=about_contribute" target="_blank">'+$.i18n("about_contribute")+'</a></p>',libh];
createTable("","atb","about_cont"); createTable("","atb","about_cont");
for(var i = 0; i<fc.length; i++) for(var i = 0; i<fc.length; i++)
$('.atb').append(createTableRow([fc[i],sc[i]], "atb", false, true)); $('.atb').append(createTableRow([fc[i],sc[i]], "atb", false, true));
$('#danger_trig').off().on('click',function(){
dcount++;
if(dcount > 2)
$('#danger_act').toggle(true);
});
$('#reset_cache').off().on('click',function(){
localStorage.clear();
});
$('#hyp_restart').off().on('click',function(){
initRestart();
});
</script> </script>

7
assets/webconfig/content/dashboard.html
View File

@ -13,6 +13,10 @@
<div class="panel-body"> <div class="panel-body">
<table class="table borderless"> <table class="table borderless">
<tbody> <tbody>
<tr>
<td data-i18n="dashboard_infobox_label_statush"></td>
<td id="dash_statush" style="font-weight:bold">unknown</td>
</tr>
<tr> <tr>
<td data-i18n="dashboard_infobox_label_platform">Platform:</td> <td data-i18n="dashboard_infobox_label_platform">Platform:</td>
<td id="dash_platform"></td> <td id="dash_platform"></td>
@ -40,6 +44,9 @@
</tbody> </tbody>
</table> </table>
<hr> <hr>
<p style="font-weight:bold" data-i18n="dashboard_infobox_label_smartacc">Smart Access<p>
<span id="btn_hsc"></span>
<hr>
<span id="versioninforesult"></span> <span id="versioninforesult"></span>
</div> </div>
</div> </div>

24
assets/webconfig/content/remote.html
View File

@ -1,16 +1,7 @@
<div class="container-fluid"> <div class="container-fluid">
<h3 class="page-header"><i class="fa fa-wifi fa-fw"></i><span data-i18n="main_menu_remotecontrol_token">Remote Control</span></h3> <h3 class="page-header"><i class="fa fa-wifi fa-fw"></i><span data-i18n="main_menu_remotecontrol_token">Remote Control</span></h3>
</div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-md-12 col-lg-8 col-xxl-7">
</div>
</div>
<div class="container-fluid">
<div class="row">
<div class="col-lg-8 col-xxl-7">
<div class="panel panel-default" > <div class="panel panel-default" >
<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_input_label">Source selection</span></div> <div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_input_label">Source selection</span></div>
<div class="panel-body"> <div class="panel-body">
@ -20,7 +11,7 @@
</div> </div>
</div> </div>
<div class="col-lg-4 col-xxl-5"> <div class="col-md-6 col-lg-4 col-xxl-5">
<div class="panel panel-default" > <div class="panel panel-default" >
<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_components_label">Components control</span></div> <div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_components_label">Components control</span></div>
<div class="panel-body" id="comp_intro"> <div class="panel-body" id="comp_intro">
@ -28,12 +19,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="container-fluid"> <div class="col-md-6 col-lg-6 col-xxl-4">
<div class="row">
<div class="col-lg-6 col-xxl-4">
<div class="panel panel-default" > <div class="panel panel-default" >
<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_color_label">Colors/Effects</span></div> <div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_color_label">Colors/Effects</span></div>
<div class="panel-body" id="color_intro"> <div class="panel-body" id="color_intro">
@ -67,7 +54,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-xxl-3"> <div class="col-md-6 col-lg-6 col-xxl-3">
<div class="panel panel-default" > <div class="panel panel-default" >
<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_maptype_label">Mapping types</span></div> <div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_maptype_label">Mapping types</span></div>
<div class="panel-body" id="maptype_intro"> <div class="panel-body" id="maptype_intro">
@ -75,7 +62,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-xxl-5"> <div class="col-md-6 col-lg-6 col-xxl-5">
<div class="panel panel-default" > <div class="panel panel-default" >
<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_adjustment_label"></span></div> <div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_adjustment_label"></span></div>
<div class="panel-body" id="adjust_content"> <div class="panel-body" id="adjust_content">
@ -84,5 +71,4 @@
</div> </div>
</div> </div>
</div> </div>
<script src="/js/content_remote.js" ></script> <script src="/js/content_remote.js" ></script>

10
assets/webconfig/i18n/de.json
View File

@ -37,6 +37,7 @@
"general_btn_on" : "An", "general_btn_on" : "An",
"general_btn_next" : "Weiter", "general_btn_next" : "Weiter",
"general_btn_back" : "Zurück", "general_btn_back" : "Zurück",
"general_btn_iswitch" : "Switch",
"dashboard_label_intro" : "Das Dashboard zeigt dir Informationen zum Systemstatus, ob Updates verfügbar sind, den Komponentenstatus sowie die letzten Blog-Posts vom Hyperion Team.", "dashboard_label_intro" : "Das Dashboard zeigt dir Informationen zum Systemstatus, ob Updates verfügbar sind, den Komponentenstatus sowie die letzten Blog-Posts vom Hyperion Team.",
"dashboard_infobox_label_title" : "Information", "dashboard_infobox_label_title" : "Information",
"dashboard_infobox_label_currenthyp" : "Deine Hyperion Version:", "dashboard_infobox_label_currenthyp" : "Deine Hyperion Version:",
@ -46,6 +47,10 @@
"dashboard_infobox_label_ports" : "Ports (json|proto):", "dashboard_infobox_label_ports" : "Ports (json|proto):",
"dashboard_infobox_message_updatewarning" : "Eine aktuellere Version von Hyperion ist verfügbar! (V$1)", "dashboard_infobox_message_updatewarning" : "Eine aktuellere Version von Hyperion ist verfügbar! (V$1)",
"dashboard_infobox_message_updatesuccess" : "Du nutzt die aktuellste Version von Hyperion.", "dashboard_infobox_message_updatesuccess" : "Du nutzt die aktuellste Version von Hyperion.",
"dashboard_infobox_label_statush" : "Hyperion Status:",
"dashboard_infobox_label_smartacc" : "Schnellzugriff",
"dashboard_infobox_label_enableh" : "Aktiviere Hyperion",
"dashboard_infobox_label_disableh" : "Deaktiviere Hyperion",
"dashboard_componentbox_label_title" : "Komponenten Status", "dashboard_componentbox_label_title" : "Komponenten Status",
"dashboard_componentbox_label_comp" : "Komponente", "dashboard_componentbox_label_comp" : "Komponente",
"dashboard_componentbox_label_status" : "Status", "dashboard_componentbox_label_status" : "Status",
@ -88,7 +93,7 @@
"conf_helptable_expl" : "Erklärung", "conf_helptable_expl" : "Erklärung",
"conf_effect_path_intro" : "Definiere weitere Effekt-Pfade, wenn nötig.", "conf_effect_path_intro" : "Definiere weitere Effekt-Pfade, wenn nötig.",
"conf_effect_fgeff_intro" : "Definiere einen Start Effekt/Farbe, dieser wird angezeigt, wenn Hyperion startet für die angegebene Dauer.", "conf_effect_fgeff_intro" : "Definiere einen Start Effekt/Farbe, dieser wird angezeigt, wenn Hyperion startet für die angegebene Dauer.",
"conf_effect_bgeff_intro" : "Definiere einen Hintergrund Effekt/Farbe, dieser wird aktiv, wenn Hyperion sich im Leerlauf befindet. (Das gilt ebenfalls für temporäres abschalten mithilfe der Kodi Überwachung).", "conf_effect_bgeff_intro" : "Definiere einen Hintergrund Effekt/Farbe. Dieser wird aktiv, wenn Hyperion sich im Leerlauf befindet. Wird immer mit Priorität 255 gestartet.",
"conf_leds_device_intro" : "Wähle eine Methode zur Steuerung deiner LEDs aus, sie sind unterteilt in verschiedene Kategorien. Neben den allgemeinen Optionen die für alle gültig sind, gibt es auch spezfische die sich unterscheiden je nach Wahl.", "conf_leds_device_intro" : "Wähle eine Methode zur Steuerung deiner LEDs aus, sie sind unterteilt in verschiedene Kategorien. Neben den allgemeinen Optionen die für alle gültig sind, gibt es auch spezfische die sich unterscheiden je nach Wahl.",
"conf_leds_layout_intro" : "Du benötigst ebenfalls ein LED Layout, welches deine LED-Positionen wiederspiegelt. Das klassische Layout wird für gewöhnlichen für TVs verwendet, Hyperion unterstützt aber auch LED Wände (Matrix). Die Ansicht des LAYOUTS ist die perspektive VOR dem Fernseher, nicht dahinter.", "conf_leds_layout_intro" : "Du benötigst ebenfalls ein LED Layout, welches deine LED-Positionen wiederspiegelt. Das klassische Layout wird für gewöhnlichen für TVs verwendet, Hyperion unterstützt aber auch LED Wände (Matrix). Die Ansicht des LAYOUTS ist die perspektive VOR dem Fernseher, nicht dahinter.",
"conf_leds_nav_label_ledcontroller" : "LED Steuerung", "conf_leds_nav_label_ledcontroller" : "LED Steuerung",
@ -187,6 +192,7 @@
"remote_input_status" : "Status/Aktion", "remote_input_status" : "Status/Aktion",
"remote_input_duration" : "Dauer:", "remote_input_duration" : "Dauer:",
"remote_input_ip" : "IP:", "remote_input_ip" : "IP:",
"remote_input_clearall" : "Lösche alle Effekte/Farben",
"remote_components_label" : "Komponentensteuerung", "remote_components_label" : "Komponentensteuerung",
"remote_components_intro" : "Starte und stoppe Komponenten von Hyperion. $1", "remote_components_intro" : "Starte und stoppe Komponenten von Hyperion. $1",
"remote_optgroup_usreffets" : "Benutzer Effekte", "remote_optgroup_usreffets" : "Benutzer Effekte",
@ -273,6 +279,8 @@
"infoDialog_import_comperror_text" : "Dein Browser unterstützt leider keinen Import. Bitte versuche es mit einem anderen Browser erneut.", "infoDialog_import_comperror_text" : "Dein Browser unterstützt leider keinen Import. Bitte versuche es mit einem anderen Browser erneut.",
"infoDialog_import_confirm_title" : "Bestätige Import", "infoDialog_import_confirm_title" : "Bestätige Import",
"infoDialog_import_confirm_text" : "Bist du sicher, dass du die Konfigurations-Datei \"$1\" importieren möchtest? Diese Aktion kann nicht rückgängig gemacht werden!", "infoDialog_import_confirm_text" : "Bist du sicher, dass du die Konfigurations-Datei \"$1\" importieren möchtest? Diese Aktion kann nicht rückgängig gemacht werden!",
"InfoDialog_iswitch_title" : "Hyperion switcher",
"InfoDialog_iswitch_text" : "Sollte in deinem lokalen Netzwerk Hyperion mehr als einmal laufen, kannst du hier zwischen den Web Konfigurationen hin und her schalten. Wähle dazu die Instanz unten aus und switche!",
"wiz_rgb_title" : "RGB Byte Reihenfolge Assistent", "wiz_rgb_title" : "RGB Byte Reihenfolge Assistent",
"wiz_rgb_intro1" : "Dieser Assisent wird dir dabei helfen die richtige Byte Reihenfolge für deine leds zu finden. Klicke auf Fortfahren um zu beginnen.", "wiz_rgb_intro1" : "Dieser Assisent wird dir dabei helfen die richtige Byte Reihenfolge für deine leds zu finden. Klicke auf Fortfahren um zu beginnen.",
"wiz_rgb_intro2" : "Wann benötigt man diesen Assistenten? Zur Erstkonfiguration oder wenn deine LEDs zb rot leuchten sollten, sie aber blau oder grün sind.", "wiz_rgb_intro2" : "Wann benötigt man diesen Assistenten? Zur Erstkonfiguration oder wenn deine LEDs zb rot leuchten sollten, sie aber blau oder grün sind.",

10
assets/webconfig/i18n/en.json
View File

@ -37,6 +37,7 @@
"general_btn_on" : "On", "general_btn_on" : "On",
"general_btn_next" : "Next", "general_btn_next" : "Next",
"general_btn_back" : "Back", "general_btn_back" : "Back",
"general_btn_iswitch" : "Switch",
"dashboard_label_intro" : "The dashboard give you a quick overview about the status of Hyperion and show you the latest news of the Hyperion Blog.", "dashboard_label_intro" : "The dashboard give you a quick overview about the status of Hyperion and show you the latest news of the Hyperion Blog.",
"dashboard_infobox_label_title" : "Information", "dashboard_infobox_label_title" : "Information",
"dashboard_infobox_label_currenthyp" : "Your Hyperion version:", "dashboard_infobox_label_currenthyp" : "Your Hyperion version:",
@ -46,6 +47,10 @@
"dashboard_infobox_label_ports" : "Ports (json|proto):", "dashboard_infobox_label_ports" : "Ports (json|proto):",
"dashboard_infobox_message_updatewarning" : "A newer version of Hyperion is available! ($1)", "dashboard_infobox_message_updatewarning" : "A newer version of Hyperion is available! ($1)",
"dashboard_infobox_message_updatesuccess" : "You run the latest version of Hyperion.", "dashboard_infobox_message_updatesuccess" : "You run the latest version of Hyperion.",
"dashboard_infobox_label_statush" : "Hyperion status:",
"dashboard_infobox_label_smartacc" : "Smart Access",
"dashboard_infobox_label_enableh" : "Enable Hyperion",
"dashboard_infobox_label_disableh" : "Disable Hyperion",
"dashboard_componentbox_label_title" : "Components status", "dashboard_componentbox_label_title" : "Components status",
"dashboard_componentbox_label_comp" : "Component", "dashboard_componentbox_label_comp" : "Component",
"dashboard_componentbox_label_status" : "Status", "dashboard_componentbox_label_status" : "Status",
@ -88,7 +93,7 @@
"conf_helptable_expl" : "Explanation", "conf_helptable_expl" : "Explanation",
"conf_effect_path_intro" : "Define more effect paths if necessary.", "conf_effect_path_intro" : "Define more effect paths if necessary.",
"conf_effect_fgeff_intro" : "Define a booteffect or color, which is shown during Hyperion startup for the defined duration.", "conf_effect_fgeff_intro" : "Define a booteffect or color, which is shown during Hyperion startup for the defined duration.",
"conf_effect_bgeff_intro" : "Define a background effect, which us shown during \"idle\". (also temporarily via Kodi Watch)", "conf_effect_bgeff_intro" : "Define a background effect/color, which is shown during Hyperion \"idle\". Sarts always with priority channel 255.",
"conf_leds_device_intro" : "Hyperion supports a lot of controllers to transmit data to your target device. Select a LED controller out of the sorted list and configure it. We have chosen the best default settings for each device.", "conf_leds_device_intro" : "Hyperion supports a lot of controllers to transmit data to your target device. Select a LED controller out of the sorted list and configure it. We have chosen the best default settings for each device.",
"conf_leds_layout_intro" : "You need also a led layout, which reflects your led positions. The classic layout is the usual used tv frame, but we also support led matrix (led walls) creation. The view on this layout is ALWAYS of the FRONT of your TV.", "conf_leds_layout_intro" : "You need also a led layout, which reflects your led positions. The classic layout is the usual used tv frame, but we also support led matrix (led walls) creation. The view on this layout is ALWAYS of the FRONT of your TV.",
"conf_leds_nav_label_ledcontroller" : "LED Controller", "conf_leds_nav_label_ledcontroller" : "LED Controller",
@ -187,6 +192,7 @@
"remote_input_status" : "Status/Action", "remote_input_status" : "Status/Action",
"remote_input_duration" : "Duration:", "remote_input_duration" : "Duration:",
"remote_input_ip" : "IP:", "remote_input_ip" : "IP:",
"remote_input_clearall" : "Clear all Effects/Colors",
"remote_components_label" : "Components control", "remote_components_label" : "Components control",
"remote_components_intro" : "Enable and disable components of Hyperion during runtime. $1", "remote_components_intro" : "Enable and disable components of Hyperion during runtime. $1",
"remote_optgroup_usreffets" : "User Effects", "remote_optgroup_usreffets" : "User Effects",
@ -273,6 +279,8 @@
"infoDialog_import_comperror_text" : "Sad! Your browser doesn't support a import. Please try again with another browser.", "infoDialog_import_comperror_text" : "Sad! Your browser doesn't support a import. Please try again with another browser.",
"infoDialog_import_confirm_title" : "Confirm import", "infoDialog_import_confirm_title" : "Confirm import",
"infoDialog_import_confirm_text" : "Are you sure to import \"$1\"? This process can't be reverted!", "infoDialog_import_confirm_text" : "Are you sure to import \"$1\"? This process can't be reverted!",
"InfoDialog_iswitch_title" : "Hyperion switcher",
"InfoDialog_iswitch_text" : "If you run Hyperion more than once in your local network, you could switch between the web configurations. Select the Hyperion instance below and switch!",
"wiz_rgb_title" : "RGB Byte Order Wizard", "wiz_rgb_title" : "RGB Byte Order Wizard",
"wiz_rgb_intro1" : "This wizard will guide you through the finding process of the correct color order for your leds. Click on continue to begin.", "wiz_rgb_intro1" : "This wizard will guide you through the finding process of the correct color order for your leds. Click on continue to begin.",
"wiz_rgb_intro2" : "When do you need this wizard? Example: You set the color red, but you get green or blue. You could also use it for first configuration.", "wiz_rgb_intro2" : "When do you need this wizard? Example: You set the color red, but you get green or blue. You could also use it for first configuration.",

5
assets/webconfig/index.html
View File

@ -91,6 +91,11 @@
<!-- /.navbar-header --> <!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right"> <ul class="nav navbar-top-links navbar-right">
<li class="dropdown" id="btn_instanceswitch" style="display:none">
<a>
<i class="fa fa-exchange fa-fw"></i>
</a>
</li>
<li class="dropdown" id="btn_open_ledsim"> <li class="dropdown" id="btn_open_ledsim">
<a> <a>
<i class="fa fa-television fa-fw"></i> <i class="fa fa-television fa-fw"></i>

4
assets/webconfig/js/content_dashboard.js
View File

@ -57,6 +57,10 @@ $(document).ready( function() {
components_html += '<tr><td>'+$.i18n('general_comp_'+components[idx].name)+'</td><td><i class="fa fa-circle component-'+(components[idx].enabled?"on":"off")+'"></i></td></tr>'; components_html += '<tr><td>'+$.i18n('general_comp_'+components[idx].name)+'</td><td><i class="fa fa-circle component-'+(components[idx].enabled?"on":"off")+'"></i></td></tr>';
} }
$("#tab_components").html(components_html); $("#tab_components").html(components_html);
//info
$('#dash_statush').html(serverInfo.hyperion.off? '<span style="color:red">'+$.i18n('general_btn_off')+'</span>':'<span style="color:green">'+$.i18n('general_btn_on')+'</span>');
$('#btn_hsc').html(serverInfo.hyperion.off? '<button class="btn btn-sm btn-success" onClick="requestSetComponentState(\'ALL\',true)">'+$.i18n('dashboard_infobox_label_enableh')+'</button>' : '<button class="btn btn-sm btn-danger" onClick="requestSetComponentState(\'ALL\',false)">'+$.i18n('dashboard_infobox_label_disableh')+'</button>');
} }
// add more info // add more info

21
assets/webconfig/js/content_index.js
View File

@ -1,5 +1,6 @@
$(document).ready( function() { $(document).ready( function() {
var uiLock = false; var uiLock = false;
var prevSess = 0;
loadContentTo("#container_connection_lost","connection_lost"); loadContentTo("#container_connection_lost","connection_lost");
loadContentTo("#container_restart","restart"); loadContentTo("#container_restart","restart");
@ -34,6 +35,26 @@ $(document).ready( function() {
uiLock = false; uiLock = false;
} }
var sess = serverInfo.hyperion.sessions;
if (sess.length != prevSess)
{
wSess = [];
prevSess = sess.length;
for(var i = 0; i<sess.length; i++)
{
if(sess[i].type == "_hyperiond-http._tcp.")
{
wSess.push(sess[i]);
}
}
if (wSess.length > 1)
$('#btn_instanceswitch').toggle(true);
else
$('#btn_instanceswitch').toggle(false);
}
}); // end cmd-serverinfo }); // end cmd-serverinfo
$(hyperion).one("cmd-sysinfo", function(event) { $(hyperion).one("cmd-sysinfo", function(event) {

37
assets/webconfig/js/content_remote.js
View File

@ -54,9 +54,9 @@ $(document).ready(function() {
else else
{ {
if(sColor[key].key == "brightness" || sColor[key].key == "backlightThreshold") if(sColor[key].key == "brightness" || sColor[key].key == "backlightThreshold")
property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0.0" max="1.0" step="0.05" value="'+value+'"/>'; property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0" max="1.0" step="0.05" value="'+value+'"/>';
else else
property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0.01" max="4.0" step="0.1" value="'+value+'"/>'; property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0.1" max="4.0" step="0.1" value="'+value+'"/>';
$('.crtbody').append(createTableRow([title, property], false, true)); $('.crtbody').append(createTableRow([title, property], false, true));
$('#cr_'+sColor[key].key).off().on('change', function(e){ $('#cr_'+sColor[key].key).off().on('change', function(e){
@ -88,18 +88,14 @@ $(document).ready(function() {
var data = ""; var data = "";
var prios = serverInfo.priorities var prios = serverInfo.priorities
var i; var i;
var clearAll = false;
for(i = 0; i < prios.length; i++) for(i = 0; i < prios.length; i++)
{ {
var origin = prios[i].origin; var origin = prios[i].origin ? prios[i].origin : "System";
if(typeof origin !== "undefined" && origin != "")
{
origin = origin.split("@"); origin = origin.split("@");
var ip = origin[1]; var ip = origin[1];
origin = origin[0]; origin = origin[0];
}
else
origin = "System";
var owner = prios[i].owner; var owner = prios[i].owner;
var active = prios[i].active; var active = prios[i].active;
@ -120,9 +116,17 @@ $(document).ready(function() {
if(ip) if(ip)
origin += '<br/><span style="font-size:80%; color:grey;">'+$.i18n('remote_input_ip')+' '+ip+'</span>'; origin += '<br/><span style="font-size:80%; color:grey;">'+$.i18n('remote_input_ip')+' '+ip+'</span>';
if(compId == "EFFECT") if(compId == "EFFECT")
{
owner = $.i18n('remote_effects_label_effects')+' '+owner; owner = $.i18n('remote_effects_label_effects')+' '+owner;
if(priority != 255)
clearAll = true;
}
if(compId == "COLOR") if(compId == "COLOR")
owner = (owner == "Off") ? $.i18n('general_btn_off') : $.i18n('remote_color_label_color')+' '+'<div style="width:18px; height:18px; border-radius:20px; margin-bottom:-4px; border:1px grey solid; background-color: rgb('+prios[i].value.RGB+'); display:inline-block" title="RGB: ('+prios[i].value.RGB+')"></div>'; {
owner = $.i18n('remote_color_label_color')+' '+'<div style="width:18px; height:18px; border-radius:20px; margin-bottom:-4px; border:1px grey solid; background-color: rgb('+prios[i].value.RGB+'); display:inline-block" title="RGB: ('+prios[i].value.RGB+')"></div>';
if(priority != 255)
clearAll = true;
}
if(compId == "GRABBER") if(compId == "GRABBER")
owner = $.i18n('general_comp_GRABBER')+': ('+owner+')'; owner = $.i18n('general_comp_GRABBER')+': ('+owner+')';
if(compId == "V4L") if(compId == "V4L")
@ -136,7 +140,7 @@ $(document).ready(function() {
var btn = '<button id="srcBtn'+i+'" type="button" '+btn_state+' class="btn btn-'+btn_type+' btn_input_selection" onclick="requestSetSource('+priority+');">'+btn_text+'</button>'; var btn = '<button id="srcBtn'+i+'" type="button" '+btn_state+' class="btn btn-'+btn_type+' btn_input_selection" onclick="requestSetSource('+priority+');">'+btn_text+'</button>';
if((compId == "EFFECT" || compId == "COLOR") && priority < 254) if((compId == "EFFECT" || compId == "COLOR") && priority != 255)
btn += '<button type="button" class="btn btn-sm btn-danger" style="margin-left:10px;" onclick="requestPriorityClear('+priority+');"><i class="fa fa-close"></button>'; btn += '<button type="button" class="btn btn-sm btn-danger" style="margin-left:10px;" onclick="requestPriorityClear('+priority+');"><i class="fa fa-close"></button>';
if(btn_type != 'default') if(btn_type != 'default')
@ -145,7 +149,9 @@ $(document).ready(function() {
var btn_auto_color = (serverInfo.priorities_autoselect? "btn-success" : "btn-danger"); var btn_auto_color = (serverInfo.priorities_autoselect? "btn-success" : "btn-danger");
var btn_auto_state = (serverInfo.priorities_autoselect? "disabled" : "enabled"); var btn_auto_state = (serverInfo.priorities_autoselect? "disabled" : "enabled");
var btn_auto_text = (serverInfo.priorities_autoselect? $.i18n('general_btn_on') : $.i18n('general_btn_off')); var btn_auto_text = (serverInfo.priorities_autoselect? $.i18n('general_btn_on') : $.i18n('general_btn_off'));
$('#auto_btn').html('<button id="srcBtn'+i+'" type="button" '+btn_auto_state+' class="btn '+btn_auto_color+'" style="margin:10px;display:inline-block;" onclick="requestSetSource(\'auto\');">'+$.i18n('remote_input_label_autoselect')+' ('+btn_auto_text+')</button>'); var btn_call_state = (clearAll? "enabled" : "disabled");
$('#auto_btn').html('<button id="srcBtn'+i+'" type="button" '+btn_auto_state+' class="btn '+btn_auto_color+'" style="margin-right:5px;display:inline-block;" onclick="requestSetSource(\'auto\');">'+$.i18n('remote_input_label_autoselect')+' ('+btn_auto_text+')</button>');
$('#auto_btn').append('<button type="button" '+btn_call_state+' class="btn btn-danger" style="display:inline-block;" onclick="requestClearAll();">'+$.i18n('remote_input_clearall')+'</button>');
var max_width=100; var max_width=100;
$('.btn_input_selection').each(function() { $('.btn_input_selection').each(function() {
@ -167,7 +173,7 @@ $(document).ready(function() {
else else
btn_style = 'btn-primary'; btn_style = 'btn-primary';
$('#mappingsbutton').append('<button type="button" id="lmBtn_'+mappingList[ix]+'" class="btn '+btn_style+'" style="margin:10px;min-width:200px" onclick="requestMappingType(\''+mappingList[ix]+'\');">'+$.i18n('remote_maptype_label_'+mappingList[ix])+'</button><br/>'); $('#mappingsbutton').append('<button type="button" id="lmBtn_'+mappingList[ix]+'" class="btn '+btn_style+'" style="margin:3px;min-width:200px" onclick="requestMappingType(\''+mappingList[ix]+'\');">'+$.i18n('remote_maptype_label_'+mappingList[ix])+'</button><br/>');
} }
} }
@ -182,20 +188,21 @@ $(document).ready(function() {
enable_icon = (components[idx].enabled? "fa-play" : "fa-stop"); enable_icon = (components[idx].enabled? "fa-play" : "fa-stop");
comp_name = components[idx].name; comp_name = components[idx].name;
comp_btn_id = "comp_btn_"+comp_name; comp_btn_id = "comp_btn_"+comp_name;
comp_goff = serverInfo.hyperion.off? "disabled" : "enabled";
// create btn if not there // create btn if not there
if ($("#"+comp_btn_id).length == 0) if ($("#"+comp_btn_id).length == 0)
{ {
d='<p><button type="button" id="'+comp_btn_id+'" class="btn '+enable_style d='<span style="display:block;margin:3px"><button type="button" '+comp_goff+' id="'+comp_btn_id+'" class="btn '+enable_style
+'" onclick="requestSetComponentState(\''+comp_name+'\','+(!components[idx].enabled) +'" onclick="requestSetComponentState(\''+comp_name+'\','+(!components[idx].enabled)
+')"><i id="'+comp_btn_id+'_icon" class="fa '+enable_icon+'"></i></button> '+$.i18n('general_comp_'+components[idx].name)+'</p>'; +')"><i id="'+comp_btn_id+'_icon" class="fa '+enable_icon+'"></i></button> '+$.i18n('general_comp_'+components[idx].name)+'</span>';
$('#componentsbutton').append(d); $('#componentsbutton').append(d);
} }
else // already create, update state else // already create, update state
{ {
setClassByBool( $('#'+comp_btn_id) , components[idx].enabled, "btn-danger", "btn-success" ); setClassByBool( $('#'+comp_btn_id) , components[idx].enabled, "btn-danger", "btn-success" );
setClassByBool( $('#'+comp_btn_id+"_icon"), components[idx].enabled, "fa-stop" , "fa-play" ); setClassByBool( $('#'+comp_btn_id+"_icon"), components[idx].enabled, "fa-stop" , "fa-play" );
$('#'+comp_btn_id).attr("onclick",'requestSetComponentState(\''+comp_name+'\','+(!components[idx].enabled)+')'); $('#'+comp_btn_id).attr("onclick",'requestSetComponentState(\''+comp_name+'\','+(!components[idx].enabled)+')').attr(comp_goff);
} }
} }
} }

6
assets/webconfig/js/hyperion.js
View File

@ -22,6 +22,7 @@ var loggingStreamActive = false;
var loggingHandlerInstalled = false; var loggingHandlerInstalled = false;
var watchdog = 0; var watchdog = 0;
var debugMessagesActive = true; var debugMessagesActive = true;
var wSess = [];
function initRestart() function initRestart()
{ {
@ -224,6 +225,11 @@ function requestPriorityClear(prio)
sendToHyperion("clear", "", '"priority":'+prio+''); sendToHyperion("clear", "", '"priority":'+prio+'');
} }
function requestClearAll()
{
sendToHyperion("clearall");
}
function requestPlayEffect(effectName, duration) function requestPlayEffect(effectName, duration)
{ {
sendToHyperion("effect", "", '"effect":{"name":"'+effectName+'"},"priority":'+webPrio+',"duration":'+validateDuration(duration)+',"origin":"'+webOrigin+'"'); sendToHyperion("effect", "", '"effect":{"name":"'+effectName+'"},"priority":'+webPrio+',"duration":'+validateDuration(duration)+',"origin":"'+webOrigin+'"');

20
assets/webconfig/js/settings.js
View File

@ -115,4 +115,24 @@ $(document).ready( function() {
//hide menu elements //hide menu elements
if (storedAccess != 'expert') if (storedAccess != 'expert')
$('#load_webconfig').toggle(false); $('#load_webconfig').toggle(false);
// instance switcher
$('#btn_instanceswitch').off().on('click',function() {
var lsys = sysInfo.system.hostName+':'+serverConfig.webConfig.port;
showInfoDialog('iswitch', $.i18n('InfoDialog_iswitch_title'), $.i18n('InfoDialog_iswitch_text'));
for (var i = 0; i<wSess.length; i++)
{
if(lsys != wSess[i].host+':'+wSess[i].port)
$('#id_select').append(createSelOpt('http://'+wSess[i].address+':'+wSess[i].port, wSess[i].name))
}
$('#id_btn_saveset').off().on('click',function() {
$("#loading_overlay").addClass("overlay");
window.location.href = $('#id_select').val()
});
});
}); });

13
assets/webconfig/js/ui_utils.js
View File

@ -154,6 +154,11 @@ function showInfoDialog(type,header,message)
$('#id_footer').html('<button type="button" id="id_btn_saveset" class="btn btn-primary" data-dismiss="modal"><i class="fa fa-fw fa-save"></i>'+$.i18n('general_btn_saveandreload')+'</button>'); $('#id_footer').html('<button type="button" id="id_btn_saveset" class="btn btn-primary" data-dismiss="modal"><i class="fa fa-fw fa-save"></i>'+$.i18n('general_btn_saveandreload')+'</button>');
$('#id_footer').append('<button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>'+$.i18n('general_btn_cancel')+'</button>'); $('#id_footer').append('<button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>'+$.i18n('general_btn_cancel')+'</button>');
} }
else if (type == "iswitch"){
$('#id_body').html('<img style="margin-bottom:20px" src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">');
$('#id_footer').html('<button type="button" id="id_btn_saveset" class="btn btn-primary" data-dismiss="modal"><i class="fa fa-fw fa-exchange"></i>'+$.i18n('general_btn_iswitch')+'</button>');
$('#id_footer').append('<button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>'+$.i18n('general_btn_cancel')+'</button>');
}
else if (type == "uilock"){ else if (type == "uilock"){
$('#id_body').html('<img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">'); $('#id_body').html('<img src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">');
$('#id_footer').html('<b>'+$.i18n('InfoDialog_nowrite_foottext')+'</b>'); $('#id_footer').html('<b>'+$.i18n('InfoDialog_nowrite_foottext')+'</b>');
@ -174,7 +179,7 @@ function showInfoDialog(type,header,message)
$('#id_body').append('<h4 style="font-weight:bold;text-transform:uppercase;">'+header+'</h4>'); $('#id_body').append('<h4 style="font-weight:bold;text-transform:uppercase;">'+header+'</h4>');
$('#id_body').append(message); $('#id_body').append(message);
if(type == "select") if(type == "select" || type == "iswitch")
$('#id_body').append('<select id="id_select" class="form-control" style="margin-top:10px;width:auto;"></select>'); $('#id_body').append('<select id="id_select" class="form-control" style="margin-top:10px;width:auto;"></select>');
$("#modal_dialog").modal({ $("#modal_dialog").modal({
@ -227,10 +232,6 @@ function createHint(type, text, container)
} }
function valValue(id,value,min,max) function valValue(id,value,min,max)
{
//TODO: Do not use parser, all values are now typeof number
value = parseInt(value)
if(typeof value === 'number')
{ {
if(typeof max === 'undefined' || max == "") if(typeof max === 'undefined' || max == "")
max = 999999; max = 999999;
@ -249,8 +250,6 @@ function valValue(id,value,min,max)
} }
return value; return value;
} }
return value;
}
function readImg(input,cb) function readImg(input,cb)
{ {

12
config/hyperion.config.json.commented
View File

@ -188,7 +188,7 @@
/// The black border configuration, contains the following items: /// The black border configuration, contains the following items:
/// * enable : true if the detector should be activated /// * enable : true if the detector should be activated
/// * threshold : Value below which a pixel is regarded as black (value between 0.0 and 1.0) /// * threshold : Value below which a pixel is regarded as black (value between 0 and 100 [%])
/// * unknownFrameCnt : Number of frames without any detection before the border is set to 0 (default 600) /// * unknownFrameCnt : Number of frames without any detection before the border is set to 0 (default 600)
/// * borderFrameCnt : Number of frames before a consistent detected border gets set (default 50) /// * borderFrameCnt : Number of frames before a consistent detected border gets set (default 50)
/// * maxInconsistentCnt : Number of inconsistent frames that are ignored before a new border gets a chance to proof consistency /// * maxInconsistentCnt : Number of inconsistent frames that are ignored before a new border gets a chance to proof consistency
@ -197,7 +197,7 @@
"blackborderdetector" : "blackborderdetector" :
{ {
"enable" : true, "enable" : true,
"threshold" : 0.05, "threshold" : 5,
"unknownFrameCnt" : 600, "unknownFrameCnt" : 600,
"borderFrameCnt" : 50, "borderFrameCnt" : 50,
"maxInconsistentCnt" : 10, "maxInconsistentCnt" : 10,
@ -290,19 +290,19 @@
/// The configuration of the boblight server which enables the boblight remote interface /// The configuration of the boblight server which enables the boblight remote interface
/// * enable : Enable or disable the boblight server (true/false) /// * enable : Enable or disable the boblight server (true/false)
/// * port : Port at which the boblight server is started /// * port : Port at which the boblight server is started
/// * priority : Priority of the boblight server (Default=200) HINT: lower value result in HIGHER priority! /// * priority : Priority of the boblight server (Default=201) HINT: lower value result in HIGHER priority!
"boblightServer" : "boblightServer" :
{ {
"enable" : false, "enable" : false,
"port" : 19333, "port" : 19333,
"priority" : 200 "priority" : 201
}, },
/// The configuration of the udp listener /// The configuration of the udp listener
/// * enable : Enable or disable the udp listener (true/false) /// * enable : Enable or disable the udp listener (true/false)
/// * address : The listener address, pre configured is multicast which listen also to unicast ip addresses at the same time. If emtpy, multicast is disabled and it also accepts unicast from all IPs /// * address : The listener address, pre configured is multicast which listen also to unicast ip addresses at the same time. If emtpy, multicast is disabled and it also accepts unicast from all IPs
/// * port : Port at which the udp listener starts /// * port : Port at which the udp listener starts
/// * priority : Priority of the udp listener server (Default=190) /// * priority : Priority of the udp listener server (Default=200)
/// * timeout : The timeout sets the timelimit for a "soft" off of the udp listener, if no packages are received (for example to switch to a gabber or InitialEffect - background-effect) /// * timeout : The timeout sets the timelimit for a "soft" off of the udp listener, if no packages are received (for example to switch to a gabber or InitialEffect - background-effect)
/// * shared : If true, the udp listener is shared across all hyperion instances (if using more than one (forwarder)) /// * shared : If true, the udp listener is shared across all hyperion instances (if using more than one (forwarder))
"udpListener" : "udpListener" :
@ -310,7 +310,7 @@
"enable" : false, "enable" : false,
"address" : "239.255.28.01", "address" : "239.255.28.01",
"port" : 2801, "port" : 2801,
"priority" : 190, "priority" : 200,
"timeout" : 10000, "timeout" : 10000,
"shared" : false "shared" : false
}, },

6
config/hyperion.config.json.default
View File

@ -105,7 +105,7 @@
"blackborderdetector" : "blackborderdetector" :
{ {
"enable" : true, "enable" : true,
"threshold" : 0.05, "threshold" : 5,
"unknownFrameCnt" : 600, "unknownFrameCnt" : 600,
"borderFrameCnt" : 50, "borderFrameCnt" : 50,
"maxInconsistentCnt" : 10, "maxInconsistentCnt" : 10,
@ -165,7 +165,7 @@
{ {
"enable" : false, "enable" : false,
"port" : 19333, "port" : 19333,
"priority" : 200 "priority" : 201
}, },
"udpListener" : "udpListener" :
@ -173,7 +173,7 @@
"enable" : false, "enable" : false,
"address" : "239.255.28.01", "address" : "239.255.28.01",
"port" : 2801, "port" : 2801,
"priority" : 190, "priority" : 200,
"timeout" : 10000, "timeout" : 10000,
"shared" : false "shared" : false
}, },

18
include/utils/jsonschema/QJsonSchemaChecker.h
View File

@ -112,6 +112,24 @@ private:
/// ///
void checkMaximum(const QJsonValue & value, const QJsonValue & schema); void checkMaximum(const QJsonValue & value, const QJsonValue & schema);
///
/// Checks if the given value is hugher than the specified value. If this is the
/// case _error is set to true and an error-message is added to the message-queue.
///
/// @param value The given value
/// @param schema The minimum size specification (as json-value)
///
void checkMinLength(const QJsonValue & value, const QJsonValue & schema);
///
/// Checks if the given value is smaller than the specified value. If this is the
/// case _error is set to true and an error-message is added to the message-queue.
///
/// @param value The given value
/// @param schema The maximum size specification (as json-value)
///
void checkMaxLength(const QJsonValue & value, const QJsonValue & schema);
/// ///
/// Validates all the items of an array. /// Validates all the items of an array.
/// ///

2
libsrc/blackborder/BlackBorderProcessor.cpp
View File

@ -15,7 +15,7 @@ BlackBorderProcessor::BlackBorderProcessor(const QJsonObject &blackborderConfig)
, _maxInconsistentCnt(blackborderConfig["maxInconsistentCnt"].toInt(10)) , _maxInconsistentCnt(blackborderConfig["maxInconsistentCnt"].toInt(10))
, _blurRemoveCnt(blackborderConfig["blurRemoveCnt"].toInt(1)) , _blurRemoveCnt(blackborderConfig["blurRemoveCnt"].toInt(1))
, _detectionMode(blackborderConfig["mode"].toString("default")) , _detectionMode(blackborderConfig["mode"].toString("default"))
, _detector(blackborderConfig["threshold"].toDouble(0.01)) , _detector(blackborderConfig["threshold"].toDouble(5.0)/100)
, _currentBorder({true, -1, -1}) , _currentBorder({true, -1, -1})
, _previousDetectedBorder({true, -1, -1}) , _previousDetectedBorder({true, -1, -1})
, _consistentCnt(0) , _consistentCnt(0)

4
libsrc/hyperion/Hyperion.cpp
View File

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

2
libsrc/hyperion/PriorityMuxer.cpp
View File

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

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

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

7
libsrc/jsonserver/JsonClientConnection.cpp
View File

@ -617,7 +617,7 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
const Hyperion::InputInfo & priorityInfo = _hyperion->getPriorityInfo(priority); const Hyperion::InputInfo & priorityInfo = _hyperion->getPriorityInfo(priority);
QJsonObject item; QJsonObject item;
item["priority"] = priority; item["priority"] = priority;
if (priorityInfo.timeoutTime_ms != -1) if (priorityInfo.timeoutTime_ms != -1 && (priorityInfo.componentId == hyperion::COMP_COLOR || priorityInfo.componentId == hyperion::COMP_EFFECT))
{ {
item["duration_ms"] = int(priorityInfo.timeoutTime_ms - now); item["duration_ms"] = int(priorityInfo.timeoutTime_ms - now);
} }
@ -625,7 +625,6 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
item["owner"] = QString(hyperion::componentToIdString(priorityInfo.componentId)); item["owner"] = QString(hyperion::componentToIdString(priorityInfo.componentId));
item["componentId"] = QString(hyperion::componentToIdString(priorityInfo.componentId)); item["componentId"] = QString(hyperion::componentToIdString(priorityInfo.componentId));
item["origin"] = priorityInfo.origin; item["origin"] = priorityInfo.origin;
item["component"] = QString(hyperion::componentToString(priorityInfo.componentId));
item["active"] = true; item["active"] = true;
item["visible"] = (priority == currentPriority); item["visible"] = (priority == currentPriority);
@ -816,9 +815,7 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
for(auto comp : components) for(auto comp : components)
{ {
QJsonObject item; QJsonObject item;
item["id"] = comp.first;
item["name"] = QString::fromStdString(hyperion::componentToIdString(comp.first)); item["name"] = QString::fromStdString(hyperion::componentToIdString(comp.first));
item["title"] = QString::fromStdString(hyperion::componentToString(comp.first));
item["enabled"] = comp.second; item["enabled"] = comp.second;
component.append(item); component.append(item);
@ -831,6 +828,7 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
QJsonObject hyperion; QJsonObject hyperion;
hyperion["config_modified" ] = _hyperion->configModified(); hyperion["config_modified" ] = _hyperion->configModified();
hyperion["config_writeable"] = _hyperion->configWriteable(); hyperion["config_writeable"] = _hyperion->configWriteable();
hyperion["off"] = hyperionIsActive()? false : true;
// sessions // sessions
QJsonArray sessions; QJsonArray sessions;
@ -1523,4 +1521,3 @@ void JsonClientConnection::setImage(int priority, const Image<ColorRgb> & image,
} }

6
libsrc/jsonserver/schema/schema-adjustment.json
View File

@ -109,19 +109,19 @@
"gammaRed": { "gammaRed": {
"type" : "number", "type" : "number",
"required" : false, "required" : false,
"minimum" : 0.0, "minimum" : 0.1,
"maximum" : 100.0 "maximum" : 100.0
}, },
"gammaGreen": { "gammaGreen": {
"type" : "number", "type" : "number",
"required" : false, "required" : false,
"minimum" : 0.0, "minimum" : 0.1,
"maximum" : 100.0 "maximum" : 100.0
}, },
"gammaBlue": { "gammaBlue": {
"type" : "number", "type" : "number",
"required" : false, "required" : false,
"minimum" : 0.0, "minimum" : 0.1,
"maximum" : 100.0 "maximum" : 100.0
}, },
"backlightThreshold" : { "backlightThreshold" : {

4
libsrc/jsonserver/schema/schema-color.json
View File

@ -13,7 +13,7 @@
"priority": { "priority": {
"type": "integer", "type": "integer",
"minimum" : 1, "minimum" : 1,
"maximum" : 253, "maximum" : 254,
"required": true "required": true
}, },
"duration": { "duration": {
@ -22,6 +22,8 @@
}, },
"origin": { "origin": {
"type": "string", "type": "string",
"minLength" : 4,
"maxLength" : 20,
"required": true "required": true
}, },
"color": { "color": {

4
libsrc/jsonserver/schema/schema-effect.json
View File

@ -13,7 +13,7 @@
"priority": { "priority": {
"type": "integer", "type": "integer",
"minimum" : 1, "minimum" : 1,
"maximum" : 253, "maximum" : 254,
"required": true "required": true
}, },
"duration": { "duration": {
@ -22,6 +22,8 @@
}, },
"origin": { "origin": {
"type": "string", "type": "string",
"minLength" : 4,
"maxLength" : 20,
"required": true "required": true
}, },
"effect": { "effect": {

38
libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
View File

@ -85,6 +85,10 @@ void QJsonSchemaChecker::validate(const QJsonValue & value, const QJsonObject &s
checkMinimum(value, attributeValue); checkMinimum(value, attributeValue);
else if (attribute == "maximum") else if (attribute == "maximum")
checkMaximum(value, attributeValue); checkMaximum(value, attributeValue);
else if (attribute == "minLength")
checkMinLength(value, attributeValue);
else if (attribute == "maxLength")
checkMaxLength(value, attributeValue);
else if (attribute == "items") else if (attribute == "items")
{ {
if (value.isArray()) if (value.isArray())
@ -250,6 +254,40 @@ void QJsonSchemaChecker::checkMaximum(const QJsonValue & value, const QJsonValue
} }
} }
void QJsonSchemaChecker::checkMinLength(const QJsonValue & value, const QJsonValue & schema)
{
if (!value.isString())
{
// only for Strings
_error = true;
setMessage("minLength check only for string fields");
return;
}
if (value.toString().size() < schema.toInt())
{
_error = true;
setMessage("value is too short (minLength=" + schema.toString() + ")");
}
}
void QJsonSchemaChecker::checkMaxLength(const QJsonValue & value, const QJsonValue & schema)
{
if (!value.isString())
{
// only for Strings
_error = true;
setMessage("maxLength check only for string fields");
return;
}
if (value.toString().size() > schema.toInt())
{
_error = true;
setMessage("value is too long (maxLength=" + schema.toString() + ")");
}
}
void QJsonSchemaChecker::checkItems(const QJsonValue & value, const QJsonObject & schema) void QJsonSchemaChecker::checkItems(const QJsonValue & value, const QJsonObject & schema)
{ {
if (!value.isArray()) if (!value.isArray())

2
src/hyperiond/hyperiond.cpp
View File

@ -210,7 +210,7 @@ void HyperionDaemon::startInitialEffect()
const QJsonObject & BGEffectConfig = _qconfig["backgroundEffect"].toObject(); const QJsonObject & BGEffectConfig = _qconfig["backgroundEffect"].toObject();
const int FG_PRIORITY = 0; const int FG_PRIORITY = 0;
const int DURATION_INFINITY = 0; const int DURATION_INFINITY = 0;
const int BG_PRIORITY = PriorityMuxer::LOWEST_PRIORITY -1; const int BG_PRIORITY = PriorityMuxer::LOWEST_PRIORITY;
// clear the leds // clear the leds
hyperion->setColor(FG_PRIORITY, ColorRgb::BLACK, 100, false); hyperion->setColor(FG_PRIORITY, ColorRgb::BLACK, 100, false);