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

detect config is readonly, adalight and other stuff (#333)

Browse Source 
* update lightberry sketches
update compilehowwto (windows disclaimer)
some refactoring in main cmakelists + preparation for windows compile
tune ada driver, set delayAfterConnect default to 1.5s because some arduino (e.g. mega r3) needs this
set priority min/max for grabber/network services - prevent colliding prios between webui/background stuff and grabbers/net services

* add check if config is writable. TODO do something usefull in webui

* fix indention error

* fix typo

* fix webui can't write led config

* typo

* fix cmakelists

* change methode of detecting linux
This commit is contained in:
redPanther
2016-12-14 22:45:00 +01:00
committed by GitHub
parent 5774457893
commit a724fd1535
20 changed files with 609 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@
<div class="panel panel-primary">
<div class="panel-heading headcollapse" data-toggle="collapse" data-parent="#accordion" data-target="#collapse4">
<h4 class="panel-title">
<a><i class="fa fa-wrench fa-fw"></i><span data-i18n="conf_leds_layout_generatedconf">Generated/Actual LED Configuration</span></a>
<a><i class="fa fa-wrench fa-fw"></i><span data-i18n="conf_leds_layout_generatedconf">Generated/Current LED Configuration</span></a>
</h4>
</div>
<div id="collapse4" class="panel-collapse collapse in">

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

@@ -22,6 +22,12 @@ $(document).ready( function() {
parsedServerInfoJSON = event.response;
currentVersion = parsedServerInfoJSON.info.hyperion[0].version;
cleanCurrentVersion = currentVersion.replace(/\./g, '');
// ToDo lock config menu and display appropriate message
if (! parsedServerInfoJSON.info.hyperion[0].config_writeable)
{
console.log("ATTENTION config is not writable");
}
if (parsedServerInfoJSON.info.hyperion[0].config_modified)
$("#hyperion_reload_notify").fadeIn("fast");

5
assets/webconfig/js/content_leds.js
View File

@@ -472,11 +472,8 @@ $(document).ready(function() {
// ------------------------------------------------------------------
$("#leds_custom_save").off().on("click", function() {
function createLedConfig(){
var string = '{"leds" :'+$("#ledconfig").val()+'}';
}
if (validateText())
requestWriteConfig(JSON.parse(createLedConfig()));
requestWriteConfig(JSON.parse('{"leds" :'+$("#ledconfig").val()+'}'));
});
// ------------------------------------------------------------------