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

Merge pull request #579 from b1rdhous3/master

Browse Source 
Renaming versionBranch, JSONEditor Enchancements and Chang Readme.md
This commit is contained in:
Paulchen Panther 2019-07-19 17:44:19 +02:00 committed by GitHub
commit 77299ba077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -7,7 +7,7 @@
## About Hyperion ## About Hyperion
[Hyperion.NG](https://github.com/hyperion-project/hyperion.ng) is an opensource '[AmbiLight](https://de.wikipedia.org/wiki/Ambilight)' implementation with support for many LED devices and video grabbers. The project is still in a beta development stage (no stable release available). [Hyperion.NG](https://github.com/hyperion-project/hyperion.ng) is an opensource [Bias or Ambient Lighting](https://en.wikipedia.org/wiki/Bias_lighting) implementation which you might know from TV manufactures. It supports many LED devices and video grabbers. The project is still in a beta development stage (no stable release available).
![Screenshot](doc/screenshot.png) ![Screenshot](doc/screenshot.png)
@ -35,6 +35,8 @@ For an example, you can participate in the translation.
## Requirements ## Requirements
Debian 9, Ubuntu 16.04 or higher. Windows is not supported currently. Debian 9, Ubuntu 16.04 or higher. Windows is not supported currently.
We provide a macOS Build but we can not support this.
## Building ## Building
See [CompileHowto](CompileHowto.md) and [CrossCompileHowto](CrossCompileHowto.txt). See [CompileHowto](CompileHowto.md) and [CrossCompileHowto](CrossCompileHowto.txt).

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

@ -1,10 +1,10 @@
<div class="container-fluid"> <div class="container-fluid">
<h3 class="page-header"><i class="fa fa-info-circle fa-fw"></i><span data-i18n="main_menu_about_token">About Hyperion</span></h3> <h3 class="page-header"><i class="fa fa-info-circle fa-fw"></i><span data-i18n="main_menu_about_token">About Hyperion</span></h3>
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-12">
<div id="about_cont"></div> <div id="about_cont"></div>
</div> </div>
<div id="danger_act"class="col-lg-6" style="display:none"> <div id="danger_act"class="col-lg-6" style="display:none;padding-top:20px">
<h4>You found a hidden service menu!</h4> <h4>You found a hidden service menu!</h4>
<button id="reset_cache" class="btn btn-danger">Reset Browser Cache</button> <button id="reset_cache" class="btn btn-danger">Reset Browser Cache</button>
<button id="hyp_restart" class="btn btn-danger">Force Hyperion Restart</button> <button id="hyp_restart" class="btn btn-danger">Force Hyperion Restart</button>
@ -49,4 +49,6 @@
$('#hyp_restart').off().on('click',function(){ $('#hyp_restart').off().on('click',function(){
initRestart(); initRestart();
}); });
removeOverlay();
</script> </script>

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

@ -38,8 +38,8 @@
<td id="dash_currv">unknown</td> <td id="dash_currv">unknown</td>
</tr> </tr>
<tr> <tr>
<td data-i18n="dashboard_infobox_label_versionbranch">Version Branch:</td> <td data-i18n="dashboard_infobox_label_watchedversionbranch">Watched version branch:</td>
<td id="dash_versionbranch">unknown</td> <td id="dash_watchedversionbranch">unknown</td>
</tr> </tr>
<tr> <tr>
<td data-i18n="dashboard_infobox_label_latesthyp">Latest version:</td> <td data-i18n="dashboard_infobox_label_latesthyp">Latest version:</td>

2
assets/webconfig/content/update.html
View File

@ -25,7 +25,7 @@ $(document).ready( function(error) {
for (var key in window.gitHubVersionList) for (var key in window.gitHubVersionList)
{ {
if(window.gitHubVersionList[key].name == null || (window.serverConfig.general.versionBranch == "Stable" && window.gitHubVersionList[key].prerelease == true)) if(window.gitHubVersionList[key].name == null || (window.serverConfig.general.watchedVersionBranch == "Stable" && window.gitHubVersionList[key].prerelease == true))
{ {
continue; continue;
} }

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

@ -50,7 +50,7 @@
"dashboard_infobox_label_platform": "Plattform:", "dashboard_infobox_label_platform": "Plattform:",
"dashboard_infobox_label_instance": "Instanz:", "dashboard_infobox_label_instance": "Instanz:",
"dashboard_infobox_label_ports": "Ports (flat|proto):", "dashboard_infobox_label_ports": "Ports (flat|proto):",
"dashboard_infobox_label_versionbranch": "Versionszweig:", "dashboard_infobox_label_watchedversionbranch": "Ausgewählter Versionszweig:",
"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_statush": "Hyperion Status:",
@ -441,8 +441,8 @@
"edt_conf_gen_name_expl": "Der Name wird verwendet, um Hyperion besser zu identifizieren. (Hilfreich bei mehreren Instanzen)", "edt_conf_gen_name_expl": "Der Name wird verwendet, um Hyperion besser zu identifizieren. (Hilfreich bei mehreren Instanzen)",
"edt_conf_gen_showOptHelp_title": "Zeige Erklärungen", "edt_conf_gen_showOptHelp_title": "Zeige Erklärungen",
"edt_conf_gen_showOptHelp_expl": "Zeige alle verfügbaren Options-Erklärungen. Empfohlen für Anfänger", "edt_conf_gen_showOptHelp_expl": "Zeige alle verfügbaren Options-Erklärungen. Empfohlen für Anfänger",
"edt_conf_gen_versionBranch_title": "Versionszweig", "edt_conf_gen_watchedVersionBranch_title": "Ausgewählter Versionszweig",
"edt_conf_gen_versionBranch_expl": "Gibt an, welcher Versionszweig für die Suche von neuen Hyperion Versionen genutzt werden soll.", "edt_conf_gen_watchedVersionBranch_expl": "Gibt an, welcher Versionszweig für die Suche von neuen Hyperion Versionen genutzt werden soll.",
"edt_conf_color_heading_title": "Farbkalibrierung", "edt_conf_color_heading_title": "Farbkalibrierung",
"edt_conf_color_channelAdjustment_header_itemtitle": "Profil", "edt_conf_color_channelAdjustment_header_itemtitle": "Profil",
"edt_conf_color_channelAdjustment_header_title": "Anpassung Farbkanäle", "edt_conf_color_channelAdjustment_header_title": "Anpassung Farbkanäle",

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

@ -50,7 +50,7 @@
"dashboard_infobox_label_platform" : "Platform:", "dashboard_infobox_label_platform" : "Platform:",
"dashboard_infobox_label_instance" : "Instance:", "dashboard_infobox_label_instance" : "Instance:",
"dashboard_infobox_label_ports" : "Ports (flat|proto):", "dashboard_infobox_label_ports" : "Ports (flat|proto):",
"dashboard_infobox_label_versionbranch" : "Version Branch:", "dashboard_infobox_label_watchedversionbranch" : "Watched version branch:",
"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_statush" : "Hyperion status:",
@ -441,8 +441,8 @@
"edt_conf_gen_name_expl" : "A user defined name which is used to detect Hyperion. (Helpful with more than one Hyperion instance)", "edt_conf_gen_name_expl" : "A user defined name which is used to detect Hyperion. (Helpful with more than one Hyperion instance)",
"edt_conf_gen_showOptHelp_title" : "Show explanations", "edt_conf_gen_showOptHelp_title" : "Show explanations",
"edt_conf_gen_showOptHelp_expl" : "Show all available explanations in each section. Highly recommended for beginners!", "edt_conf_gen_showOptHelp_expl" : "Show all available explanations in each section. Highly recommended for beginners!",
"edt_conf_gen_versionBranch_title" : "Version Branch", "edt_conf_gen_watchedVersionBranch_title" : "Watched version branch",
"edt_conf_gen_versionBranch_expl" : "Selects which version branch should be used for searching new Hyperion versions.", "edt_conf_gen_watchedVersionBranch_expl" : "Selects which version branch should be used for searching new Hyperion versions.",
"edt_conf_color_heading_title" : "Color Calibration", "edt_conf_color_heading_title" : "Color Calibration",
"edt_conf_color_channelAdjustment_header_itemtitle" : "Profile", "edt_conf_color_channelAdjustment_header_itemtitle" : "Profile",
"edt_conf_color_channelAdjustment_header_title" : "Color channel adjustments", "edt_conf_color_channelAdjustment_header_title" : "Color channel adjustments",

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

@ -78,7 +78,7 @@ $(document).ready( function() {
$('#dash_currv').html(window.currentChannel+' '+window.currentVersion); $('#dash_currv').html(window.currentChannel+' '+window.currentVersion);
$('#dash_instance').html(window.serverConfig.general.name); $('#dash_instance').html(window.serverConfig.general.name);
$('#dash_ports').html(window.serverConfig.flatbufServer.port+' | '+window.serverConfig.protoServer.port); $('#dash_ports').html(window.serverConfig.flatbufServer.port+' | '+window.serverConfig.protoServer.port);
$('#dash_versionbranch').html(window.serverConfig.general.versionBranch); $('#dash_watchedversionbranch').html(window.serverConfig.general.watchedVersionBranch);
getReleases(function(callback){ getReleases(function(callback){
if(callback) if(callback)

9
assets/webconfig/js/lib/jsoneditor.js
View File

@ -1540,8 +1540,13 @@ JSONEditor.AbstractEditor = Class.extend({
var storedAccess = this.access var storedAccess = this.access
if(this.schema.access){ if(this.schema.access){
if(this.schema.access == 'system') if(this.schema.access == 'system')
this.container.style.display = "none"; this.container.style.display = "none";
else if(this.schema.access == 'expert' && storedAccess != 'expert'){ else if(this.schema.access == 'advanced' && storedAccess == 'default')
{
this.container.style.display = "none";
}
else if(this.schema.access == 'expert' && storedAccess != 'expert')
{
this.container.style.display = "none"; this.container.style.display = "none";
//this.disable(); //this.disable();
} }

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

@ -593,6 +593,8 @@ function createHelpTable(list, phead){
// break one iteration (in the loop), if the schema has the entry hidden=true // break one iteration (in the loop), if the schema has the entry hidden=true
if ("options" in list[key] && "hidden" in list[key].options && (list[key].options.hidden)) if ("options" in list[key] && "hidden" in list[key].options && (list[key].options.hidden))
continue; continue;
if ("access" in list[key] && ((list[key].access == "advanced" && storedAccess == "default") || (list[key].access == "expert" && storedAccess != "expert")))
continue;
var text = list[key].title.replace('title', 'expl'); var text = list[key].title.replace('title', 'expl');
tbody.appendChild(createTableRow([$.i18n(list[key].title), $.i18n(text)], false, false)); tbody.appendChild(createTableRow([$.i18n(list[key].title), $.i18n(text)], false, false));
@ -604,6 +606,8 @@ function createHelpTable(list, phead){
// break one iteration (in the loop), if the schema has the entry hidden=true // break one iteration (in the loop), if the schema has the entry hidden=true
if ("options" in ilist[ikey] && "hidden" in ilist[ikey].options && (ilist[ikey].options.hidden)) if ("options" in ilist[ikey] && "hidden" in ilist[ikey].options && (ilist[ikey].options.hidden))
continue; continue;
if ("access" in ilist[ikey] && ((ilist[ikey].access == "advanced" && storedAccess == "default") || (ilist[ikey].access == "expert" && storedAccess != "expert")))
continue;
var itext = ilist[ikey].title.replace('title', 'expl'); var itext = ilist[ikey].title.replace('title', 'expl');
tbody.appendChild(createTableRow([$.i18n(ilist[ikey].title), $.i18n(itext)], false, false)); tbody.appendChild(createTableRow([$.i18n(ilist[ikey].title), $.i18n(itext)], false, false));
} }
@ -743,7 +747,7 @@ function getReleases(callback)
{ {
window.latestStableVersion = latest; window.latestStableVersion = latest;
if(window.serverConfig.general.versionBranch == "Beta" && window.latestStableVersion.tag_name.replace(/\./g, '') <= window.latestBetaVersion.tag_name.replace(/\./g, '')) if(window.serverConfig.general.watchedVersionBranch == "Beta" && window.latestStableVersion.tag_name.replace(/\./g, '') <= window.latestBetaVersion.tag_name.replace(/\./g, ''))
{ {
window.latestVersion = window.latestBetaVersion; window.latestVersion = window.latestBetaVersion;
} }

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

@ -11,7 +11,7 @@
"general" : "general" :
{ {
"name" : "MyHyperionConfig", "name" : "MyHyperionConfig",
"versionBranch" : "Stable", "watchedVersionBranch" : "Stable",
"showOptHelp" : true "showOptHelp" : true
}, },
/// set log level: silent warn verbose debug /// set log level: silent warn verbose debug

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

@ -2,7 +2,7 @@
"general" : "general" :
{ {
"name" : "My Hyperion Config", "name" : "My Hyperion Config",
"versionBranch" : "Stable", "watchedVersionBranch" : "Stable",
"showOptHelp" : true "showOptHelp" : true
}, },
"logger" : "logger" :

4
libsrc/hyperion/schema/schema-general.json
View File

@ -14,10 +14,10 @@
"required" : true, "required" : true,
"propertyOrder" : 1 "propertyOrder" : 1
}, },
"versionBranch" : "watchedVersionBranch" :
{ {
"type" : "string", "type" : "string",
"title" : "edt_conf_gen_versionBranch_title", "title" : "edt_conf_gen_watchedVersionBranch_title",
"enum" : ["Stable", "Beta"], "enum" : ["Stable", "Beta"],
"required" : true, "required" : true,
"access" : "expert", "access" : "expert",