Hyperion Light 2 (#1428)

* Hyperion Light - Have EffectEngine as component * Hyperion light - Build switches for LED Devices (Serial, Network) * Fix file uri generation * Fix missing guard for Windows * Fix file uri generation * Update jsonschema and checkschema * Allow to provide cmake build args to docker build
2025-03-01 10:33:28 +00:00 · 2022-02-11 20:36:15 +01:00
parent 9e4b58d5c6
commit 5078688dc8
47 changed files with 1920 additions and 938 deletions
--- a/assets/webconfig/js/content_effects.js
+++ b/assets/webconfig/js/content_effects.js
@@ -1,72 +1,89 @@
-$(document).ready( function() {
-	performTranslation();
+$(document).ready(function () {
+  performTranslation();

-	// update instance listing
-	updateHyperionInstanceListing();
+  var EFFECTENGINE_ENABLED = (jQuery.inArray("effectengine", window.serverInfo.services) !== -1);

-	var oldEffects = [];
-	var effects_editor = null;
-	var confFgEff = window.serverConfig.foregroundEffect.effect;
-	var confBgEff = window.serverConfig.backgroundEffect.effect;
-	var foregroundEffect_editor = null;
-	var backgroundEffect_editor = null;
+  // update instance listing
+  updateHyperionInstanceListing();

-	if(window.showOptHelp)
-	{
-		//foreground effect
-		$('#conf_cont').append(createRow('conf_cont_fge'));
-		$('#conf_cont_fge').append(createOptPanel('fa-spinner', $.i18n("edt_conf_fge_heading_title"), 'editor_container_foregroundEffect', 'btn_submit_foregroundEffect'));
+  var oldEffects = [];
+  var effects_editor = null;
+  var confFgEff = window.serverConfig.foregroundEffect.effect;
+  var confBgEff = window.serverConfig.backgroundEffect.effect;
+  var foregroundEffect_editor = null;
+  var backgroundEffect_editor = null;
+
+  if (!EFFECTENGINE_ENABLED) {
+    window.schema.foregroundEffect.properties.type.enum.splice(1, 1);
+    window.schema.foregroundEffect.properties.type.options.enum_titles.splice(1, 1);
+    window.schema.foregroundEffect.properties.type.default = "color";
+    delete window.schema.foregroundEffect.properties.effect;
+
+    window.schema.backgroundEffect.properties.type.enum.splice(1, 1);
+    window.schema.backgroundEffect.properties.type.options.enum_titles.splice(1, 1);
+    window.schema.backgroundEffect.properties.type.default = "color";
+    delete window.schema.backgroundEffect.properties.effect;
+  }
+
+  if (window.showOptHelp) {
+    //foreground effect
+    $('#conf_cont').append(createRow('conf_cont_fge'));
+    $('#conf_cont_fge').append(createOptPanel('fa-spinner', $.i18n("edt_conf_fge_heading_title"), 'editor_container_foregroundEffect', 'btn_submit_foregroundEffect'));
    $('#conf_cont_fge').append(createHelpTable(window.schema.foregroundEffect.properties, $.i18n("edt_conf_fge_heading_title"), "foregroundEffectHelpPanelId"));

-		//background effect
-		$('#conf_cont').append(createRow('conf_cont_bge'));
-		$('#conf_cont_bge').append(createOptPanel('fa-spinner', $.i18n("edt_conf_bge_heading_title"), 'editor_container_backgroundEffect', 'btn_submit_backgroundEffect'));
+    //background effect
+    $('#conf_cont').append(createRow('conf_cont_bge'));
+    $('#conf_cont_bge').append(createOptPanel('fa-spinner', $.i18n("edt_conf_bge_heading_title"), 'editor_container_backgroundEffect', 'btn_submit_backgroundEffect'));
    $('#conf_cont_bge').append(createHelpTable(window.schema.backgroundEffect.properties, $.i18n("edt_conf_bge_heading_title"), "backgroundEffectHelpPanelId"));

-		//effect path
-		if(storedAccess != 'default')
-		{
-			$('#conf_cont').append(createRow('conf_cont_ef'));
-			$('#conf_cont_ef').append(createOptPanel('fa-spinner', $.i18n("edt_conf_effp_heading_title"), 'editor_container_effects', 'btn_submit_effects'));
-			$('#conf_cont_ef').append(createHelpTable(window.schema.effects.properties, $.i18n("edt_conf_effp_heading_title")));
-		}
-	}
-	else
-	{
-		$('#conf_cont').addClass('row');
-		$('#conf_cont').append(createOptPanel('fa-spinner', $.i18n("edt_conf_fge_heading_title"), 'editor_container_foregroundEffect', 'btn_submit_foregroundEffect'));
-		$('#conf_cont').append(createOptPanel('fa-spinner', $.i18n("edt_conf_bge_heading_title"), 'editor_container_backgroundEffect', 'btn_submit_backgroundEffect'));
-		if(storedAccess != 'default')
-			$('#conf_cont').append(createOptPanel('fa-spinner', $.i18n("edt_conf_effp_heading_title"), 'editor_container_effects', 'btn_submit_effects'));
-	}
+    if (EFFECTENGINE_ENABLED) {
+      //effect path
+      if (storedAccess != 'default') {
+        $('#conf_cont').append(createRow('conf_cont_ef'));
+        $('#conf_cont_ef').append(createOptPanel('fa-spinner', $.i18n("edt_conf_effp_heading_title"), 'editor_container_effects', 'btn_submit_effects'));
+        $('#conf_cont_ef').append(createHelpTable(window.schema.effects.properties, $.i18n("edt_conf_effp_heading_title")));
+      }
+    }
+  }
+  else {
+    $('#conf_cont').addClass('row');
+    $('#conf_cont').append(createOptPanel('fa-spinner', $.i18n("edt_conf_fge_heading_title"), 'editor_container_foregroundEffect', 'btn_submit_foregroundEffect'));
+    $('#conf_cont').append(createOptPanel('fa-spinner', $.i18n("edt_conf_bge_heading_title"), 'editor_container_backgroundEffect', 'btn_submit_backgroundEffect'));
+    if (EFFECTENGINE_ENABLED) {
+      if (storedAccess != 'default')
+        $('#conf_cont').append(createOptPanel('fa-spinner', $.i18n("edt_conf_effp_heading_title"), 'editor_container_effects', 'btn_submit_effects'));
+    }
+  }

-	if(storedAccess != 'default')
-	{
-		effects_editor = createJsonEditor('editor_container_effects', {
-			effects            : window.schema.effects
-		}, true, true);
+  if (EFFECTENGINE_ENABLED) {
+    if (storedAccess != 'default') {
+      effects_editor = createJsonEditor('editor_container_effects', {
+        effects: window.schema.effects
+      }, true, true);

-		effects_editor.on('change',function() {
-			effects_editor.validate().length || window.readOnlyMode ? $('#btn_submit_effects').attr('disabled', true) : $('#btn_submit_effects').attr('disabled', false);
-		});
+      effects_editor.on('change', function () {
+        effects_editor.validate().length || window.readOnlyMode ? $('#btn_submit_effects').attr('disabled', true) : $('#btn_submit_effects').attr('disabled', false);
+      });

-		$('#btn_submit_effects').off().on('click',function() {
-			requestWriteConfig(effects_editor.getValue());
-		});
-	}
+      $('#btn_submit_effects').off().on('click', function () {
+        requestWriteConfig(effects_editor.getValue());
+      });
+    }
+  }

-	foregroundEffect_editor = createJsonEditor('editor_container_foregroundEffect', {
-		foregroundEffect   : window.schema.foregroundEffect
-	}, true, true);
+  foregroundEffect_editor = createJsonEditor('editor_container_foregroundEffect', {
+    foregroundEffect: window.schema.foregroundEffect
+  }, true, true);

-	backgroundEffect_editor = createJsonEditor('editor_container_backgroundEffect', {
-		backgroundEffect   : window.schema.backgroundEffect
-	}, true, true);
+  backgroundEffect_editor = createJsonEditor('editor_container_backgroundEffect', {
+    backgroundEffect: window.schema.backgroundEffect
+  }, true, true);

-
-	foregroundEffect_editor.on('ready',function() {
-		updateEffectlist();
-	});
+  foregroundEffect_editor.on('ready', function () {
+    if (EFFECTENGINE_ENABLED) {
+      updateEffectlist();
+    }
+  });

  foregroundEffect_editor.on('change', function () {
    var foregroundEffectEnable = foregroundEffect_editor.getEditor("root.foregroundEffect.enable").getValue();
@@ -79,8 +96,8 @@ $(document).ready( function() {
      $('#foregroundEffectHelpPanelId').hide();
    }

-		foregroundEffect_editor.validate().length || window.readOnlyMode ? $('#btn_submit_foregroundEffect').attr('disabled', true) : $('#btn_submit_foregroundEffect').attr('disabled', false);
-	});
+    foregroundEffect_editor.validate().length || window.readOnlyMode ? $('#btn_submit_foregroundEffect').attr('disabled', true) : $('#btn_submit_foregroundEffect').attr('disabled', false);
+  });

  backgroundEffect_editor.on('change', function () {
    var backgroundEffectEnable = backgroundEffect_editor.getEditor("root.backgroundEffect.enable").getValue();
@@ -93,62 +110,62 @@ $(document).ready( function() {
      $('#backgroundEffectHelpPanelId').hide();
    }

-		backgroundEffect_editor.validate().length || window.readOnlyMode ? $('#btn_submit_backgroundEffect').attr('disabled', true) : $('#btn_submit_backgroundEffect').attr('disabled', false);
-	});
+    backgroundEffect_editor.validate().length || window.readOnlyMode ? $('#btn_submit_backgroundEffect').attr('disabled', true) : $('#btn_submit_backgroundEffect').attr('disabled', false);
+  });

-	$('#btn_submit_foregroundEffect').off().on('click',function() {
-		var value = foregroundEffect_editor.getValue();
-		if(typeof value.foregroundEffect.effect == 'undefined')
-			value.foregroundEffect.effect = window.serverConfig.foregroundEffect.effect;
-		requestWriteConfig(value);
-	});
+  $('#btn_submit_foregroundEffect').off().on('click', function () {
+    var value = foregroundEffect_editor.getValue();
+    if (typeof value.foregroundEffect.effect == 'undefined')
+      value.foregroundEffect.effect = window.serverConfig.foregroundEffect.effect;
+    requestWriteConfig(value);
+  });

-	$('#btn_submit_backgroundEffect').off().on('click',function() {
-		var value = backgroundEffect_editor.getValue();
-		if(typeof value.backgroundEffect.effect == 'undefined')
-			value.backgroundEffect.effect = window.serverConfig.backgroundEffect.effect;
-		requestWriteConfig(value);
-	});
+  $('#btn_submit_backgroundEffect').off().on('click', function () {
+    var value = backgroundEffect_editor.getValue();
+    if (typeof value.backgroundEffect.effect == 'undefined')
+      value.backgroundEffect.effect = window.serverConfig.backgroundEffect.effect;
+    requestWriteConfig(value);
+  });

-	//create introduction
-	if(window.showOptHelp)
-	{
-		createHint("intro", $.i18n('conf_effect_path_intro'), "editor_container_effects");
-		createHint("intro", $.i18n('conf_effect_fgeff_intro'), "editor_container_foregroundEffect");
-		createHint("intro", $.i18n('conf_effect_bgeff_intro'), "editor_container_backgroundEffect");
-	}
+  //create introduction
+  if (window.showOptHelp) {
+    if (EFFECTENGINE_ENABLED) {
+      createHint("intro", $.i18n('conf_effect_path_intro'), "editor_container_effects");
+    }
+    createHint("intro", $.i18n('conf_effect_fgeff_intro'), "editor_container_foregroundEffect");
+    createHint("intro", $.i18n('conf_effect_bgeff_intro'), "editor_container_backgroundEffect");
+  }

-	function updateEffectlist(){
-		var newEffects = window.serverInfo.effects;
-		if (newEffects.length != oldEffects.length)
-		{
-			$('#root_foregroundEffect_effect').html('');
-			var usrEffArr = [];
-			var sysEffArr = [];
+  function updateEffectlist() {
+    var newEffects = window.serverInfo.effects;
+    if (newEffects.length != oldEffects.length) {
+      $('#root_foregroundEffect_effect').html('');
+      var usrEffArr = [];
+      var sysEffArr = [];

-			for(var i = 0; i < newEffects.length; i++)
-			{
-				var effectName = newEffects[i].name;
-				if(!/^\:/.test(newEffects[i].file))
-					usrEffArr.push(effectName);
-				else
-					sysEffArr.push(effectName);
-			}
-			$('#root_foregroundEffect_effect').append(createSel(usrEffArr, $.i18n('remote_optgroup_usreffets')));
-			$('#root_foregroundEffect_effect').append(createSel(sysEffArr, $.i18n('remote_optgroup_syseffets')));
-			$('#root_backgroundEffect_effect').html($('#root_foregroundEffect_effect').html());
-			oldEffects = newEffects;
+      for (var i = 0; i < newEffects.length; i++) {
+        var effectName = newEffects[i].name;
+        if (!/^\:/.test(newEffects[i].file))
+          usrEffArr.push(effectName);
+        else
+          sysEffArr.push(effectName);
+      }
+      $('#root_foregroundEffect_effect').append(createSel(usrEffArr, $.i18n('remote_optgroup_usreffets')));
+      $('#root_foregroundEffect_effect').append(createSel(sysEffArr, $.i18n('remote_optgroup_syseffets')));
+      $('#root_backgroundEffect_effect').html($('#root_foregroundEffect_effect').html());
+      oldEffects = newEffects;

-			$('#root_foregroundEffect_effect').val(confFgEff);
-			$('#root_backgroundEffect_effect').val(confBgEff);
-		}
-	}
+      $('#root_foregroundEffect_effect').val(confFgEff);
+      $('#root_backgroundEffect_effect').val(confBgEff);
+    }
+  }

-	//interval update
-	$(window.hyperion).on("cmd-effects-update", function(event){
-		window.serverInfo.effects = event.response.data.effects
-		updateEffectlist();
-	});
+  //interval update
+  $(window.hyperion).on("cmd-effects-update", function (event) {
+    window.serverInfo.effects = event.response.data.effects
+    updateEffectlist();
+  });

-	removeOverlay();
+  removeOverlay();
 });
+
--- a/assets/webconfig/js/content_index.js
+++ b/assets/webconfig/js/content_index.js
@@ -228,6 +228,11 @@ $(document).ready(function () {
      $("#MenuItemGrabber").attr('style', 'display:none')
      $("#MenuItemInstCapture").attr('style', 'display:none')
    }
+
+    //Hide effectsconfigurator menu entry, if effectengine is not available
+    if (jQuery.inArray("effectengine", window.serverInfo.services) === -1) {
+      $("#MenuItemEffectsConfig").attr('style', 'display:none')
+    }
  });

  $(window.hyperion).on("cmd-adjustment-update", function (event) {
@@ -312,14 +317,14 @@ $(document).ready(function () {
    window.scrollTo(0, 0);
  });

-  $(window).scroll(function() {
+  $(window).scroll(function () {
    if ($(window).scrollTop() > 65)
      $("#navbar_brand_logo").css("display", "none");
    else
      $("#navbar_brand_logo").css("display", "");
  });

-  $('#side-menu li a, #side-menu li ul li a').click(function() {
+  $('#side-menu li a, #side-menu li ul li a').click(function () {
    $('#side-menu').find('.active').toggleClass('inactive'); // find all active classes and set inactive;
    $(this).addClass('active');
  });
@@ -370,8 +375,8 @@ function SwitchToMenuItem(target, item) {
  cl_object.addClass('in'); // Add class "in" to expand header in sidebar menu;
  if (item) { // Jump to div "item" if available. Time limit 3 seconds
    function scrollTo(counter) {
-      if(counter < 30) {
-        setTimeout(function() {
+      if (counter < 30) {
+        setTimeout(function () {
          counter++;
          if ($('#' + item).length)
            $('#' + item)[0].scrollIntoView();
--- a/assets/webconfig/js/content_remote.js
+++ b/assets/webconfig/js/content_remote.js
@@ -1,6 +1,8 @@
 $(document).ready(function () {
  performTranslation();

+  var EFFECTENGINE_ENABLED = (jQuery.inArray("effectengine", window.serverInfo.services) !== -1);
+
  // update instance listing
  updateHyperionInstanceListing();

@@ -337,10 +339,13 @@ $(document).ready(function () {
  });

  $("#remote_input_reseff, #remote_input_rescol").off().on("click", function () {
-    if (this.id == "remote_input_rescol")
+    if (this.id == "remote_input_rescol") {
      sendColor();
-    else
-      sendEffect();
+    } else {
+      if (EFFECTENGINE_ENABLED) {
+        sendEffect();
+      }
+    }
  });

  $("#remote_input_repimg").off().on("click", function () {
@@ -365,7 +370,12 @@ $(document).ready(function () {
  updateInputSelect();
  updateLedMapping();
  updateVideoMode();
-  updateEffectlist();
+  if (EFFECTENGINE_ENABLED) {
+    updateEffectlist();
+  } else {
+    $('#effect_row').hide();
+  }
+

  // interval updates

--- a/assets/webconfig/js/ui_utils.js
+++ b/assets/webconfig/js/ui_utils.js
@@ -1232,7 +1232,9 @@ function getSystemInfo() {
  info += '- Kernel:            ' + sys.kernelType + ' (' + sys.kernelVersion + ' (WS: ' + sys.wordSize + '))\n';
  info += '- Root/Admin:        ' + sys.isUserAdmin + '\n';
  info += '- Qt Version:        ' + sys.qtVersion + '\n';
-  info += '- Python Version:    ' + sys.pyVersion + '\n';
+  if (jQuery.inArray("effectengine", window.serverInfo.services) !== -1) {
+    info += '- Python Version:    ' + sys.pyVersion + '\n';
+  }
  info += '- Browser:           ' + navigator.userAgent;
  return info;
 }
@@ -1349,3 +1351,4 @@ function isValidHostnameOrIP4(value) {
 function isValidHostnameOrIP(value) {
  return (isValidHostnameOrIP4(value) || isValidIPv6(value));
 }
+