From be909813880de33a16eddb2448234d69c1b29510 Mon Sep 17 00:00:00 2001 From: brindosch Date: Thu, 22 Dec 2016 16:24:31 +0100 Subject: [PATCH] add system accesslvl adjust default config --- assets/webconfig/js/lib/jsoneditor.js | 4 +++- config/hyperion.config.json.default | 20 +++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/webconfig/js/lib/jsoneditor.js b/assets/webconfig/js/lib/jsoneditor.js index dea8ee3c..4b144c53 100755 --- a/assets/webconfig/js/lib/jsoneditor.js +++ b/assets/webconfig/js/lib/jsoneditor.js @@ -1458,10 +1458,12 @@ JSONEditor.AbstractEditor = Class.extend({ this.register(); this.onWatchedFieldChange(); - //disable input field, if it didn't match the current access level + //hide input field, if it didn't match the current access level var storedAccess = localStorage.getItem("accesslevel"); if(this.schema.access){ + if(this.schema.access == 'system') + this.container.style.display = "none"; if(this.schema.access == 'expert' && storedAccess != 'expert'){ this.container.style.display = "none"; //this.disable(); diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default index db590d59..46a8e459 100644 --- a/config/hyperion.config.json.default +++ b/config/hyperion.config.json.default @@ -11,7 +11,7 @@ "output" : "/dev/null", "rate" : 1000000, "colorOrder" : "rgb", - "rewriteTime": 0 + "rewriteTime": 5000 }, "color" : @@ -97,7 +97,7 @@ "height" : -1, "frameDecimation" : 2, "sizeDecimation" : 8, - "priority" : 890, + "priority" : 850, "mode" : "2D", "useKodiChecker" : false, "cropLeft" : 0, @@ -118,10 +118,10 @@ { "enable" : true, "type" : "auto", - "width" : 96, - "height" : 96, + "width" : 80, + "height" : 45, "frequency_Hz" : 10.0, - "priority" : 890 + "priority" : 900 }, "blackborderdetector" : @@ -141,13 +141,13 @@ "grabAudio" : true, "grabMenu" : false, "grabPause" : false, - "grabScreensaver" : true, - "enable3DDetection" : true + "grabScreensaver" : false, + "enable3DDetection" : false }, "initialEffect" : { - "background-effect" : ["Full color mood blobs"], + "background-effect" : ["Warm mood blobs"], "foreground-effect" : ["Rainbow swirl fast"], "foreground-duration_ms" : 3000 }, @@ -193,9 +193,7 @@ "effects" : { - "paths" : - [ - ] + "paths" : ["../custom-effects"] }, "leds" :