'+$.i18n('general_wiki_moreto',$.i18n('conf_leds_nav_label_ledlayout'))+buildWL("user/moretopics/ledarea","Wiki")+'
'); @@ -371,7 +368,7 @@ $(document).ready(function() { // v4 of json schema with diff required assignment - remove when hyperion schema moved to v4 var ledschema = {"items":{"additionalProperties":false,"required":["h","v"],"properties":{"colorOrder":{"enum":["rgb","bgr","rbg","brg","gbr","grb"],"type":"string"},"h":{"additionalProperties":false,"properties":{"max":{"maximum":1,"minimum":0,"type":"number"},"min":{"maximum":1,"minimum":0,"type":"number"}},"type":"object"},"v":{"additionalProperties":false,"properties":{"max":{"maximum":1,"minimum":0,"type":"number"},"min":{"maximum":1,"minimum":0,"type":"number"}},"type":"object"}},"type":"object"},"type":"array"}; //create jsonace editor - var aceEdt = new JSONACEEditor(document.getElementById("aceedit"),{ + aceEdt = new JSONACEEditor(document.getElementById("aceedit"),{ mode: 'code', schema: ledschema, onChange: function(){ @@ -411,17 +408,6 @@ $(document).ready(function() { // leds to finalLedArray finalLedArray = window.serverConfig.leds; - // cl/ma leds push to textfield - $('#btn_cl_generate, #btn_ma_generate').off().on("click", function(e) { - if(e.currentTarget.id == "btn_cl_generate") - $('#collapse1').collapse('hide'); - else - $('#collapse2').collapse('hide'); - - aceEdt.set(finalLedArray); - $('#collapse4').collapse('show'); - }); - // create and update editor $("#leddevices").off().on("change", function() { var generalOptions = window.serverSchema.properties.device; @@ -436,7 +422,7 @@ $(document).ready(function() { var values_general = {}; var values_specific = {}; - var isCurrentDevice = (window.serverInfo.ledDevices.active == $(this).val()); + var isCurrentDevice = (window.serverConfig.device.type == $(this).val()); for(var key in window.serverConfig.device){ if (key != "type" && key in generalOptions.properties) @@ -507,7 +493,7 @@ $(document).ready(function() { $("#leddevices").append(createSel(optArr[3], $.i18n('conf_leds_optgroup_network'))); $("#leddevices").append(createSel(optArr[4], $.i18n('conf_leds_optgroup_usb'))); $("#leddevices").append(createSel(optArr[5], $.i18n('conf_leds_optgroup_debug'))); - $("#leddevices").val(window.serverInfo.ledDevices.active); + $("#leddevices").val(window.serverConfig.device.type); $("#leddevices").trigger("change"); // validate textfield and update preview diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js index 2c3b8ac7..bb386b11 100644 --- a/assets/webconfig/js/ui_utils.js +++ b/assets/webconfig/js/ui_utils.js @@ -40,6 +40,17 @@ function setStorage(item, value, session) } } +function removeStorage(item, session) +{ + if(storageComp()) + { + if(session === true) + sessionStorage.removeItem(item); + else + localStorage.removeItem(item); + } +} + function debugMessage(msg) { if (window.debugMessagesActive) diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js index 427b791b..b5f93834 100644 --- a/assets/webconfig/js/wizard.js +++ b/assets/webconfig/js/wizard.js @@ -705,17 +705,21 @@ function beginWizardHue() checkHueBridge(checkUserResult,$('#user').val() ? $('#user').val() : "newdeveloper"); }); - //create hue led config - for(var key in lightIDs) + $('#btn_wiz_save').off().on("click", function(){ + var hueLedConfig = []; + var finalLightIds = []; + + //create hue led config + for(var key in lightIDs) + { + if($('#hue_'+key).val() != "disabled") { - if($('#hue_'+key).val() != "disabled") - { - hueLedConfig.push(assignHuePos(key, $('#hue_'+key).val())); - finalLightIds.push(parseInt(key)); - } + hueLedConfig.push(assignHuePos(key, $('#hue_'+key).val())); + finalLightIds.push(parseInt(key)); } } + window.serverConfig.leds = hueLedConfig; //Adjust gamma, brightness and compensation diff --git a/libsrc/api/JsonAPI.cpp b/libsrc/api/JsonAPI.cpp index 66395dc9..805fb46e 100644 --- a/libsrc/api/JsonAPI.cpp +++ b/libsrc/api/JsonAPI.cpp @@ -538,7 +538,6 @@ void JsonAPI::handleServerInfoCommand(const QJsonObject& message, const QString& // get available led devices QJsonObject ledDevices; - ledDevices["active"] = _hyperion->getActiveDevice(); QJsonArray availableLedDevices; for (auto dev: LedDeviceWrapper::getDeviceMap()) { diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp index f91b8e60..908ac70d 100644 --- a/libsrc/hyperion/Hyperion.cpp +++ b/libsrc/hyperion/Hyperion.cpp @@ -235,6 +235,12 @@ void Hyperion::handleSettingsUpdate(const settings::type& type, const QJsonDocum { _ledString = hyperion::createLedString(getSetting(settings::LEDS).array(), hyperion::createColorOrder(dev)); _imageProcessor->setLedString(_ledString); + + _ledStringColorOrder.clear(); + for (Led& led : _ledString.leds()) + { + _ledStringColorOrder.push_back(led.colorOrder); + } } // do always reinit until the led devices can handle dynamic changes