node-red-contrib-knx-ultimate 7.1.4 → 8.0.2

package/resources/knxUtilityProfiles.js

@@ -36,654 +36,1248 @@
   const PROFILE_FACTORIES = {
     "alerter": function (RED) {
       RED.nodes.registerType('knxUltimateAlerter', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: false },
-                  name: { value: "" },
-                  rules: { value: [] },
-                  whentostart: { value: "ifnewalert" },
-                  timerinterval: { value: "2" },
-                  initialreadGAInRules: { value: "1" },
-              },
-              inputs: 1,
-              outputs: 3,
-              outputLabels: function (index) {
-                  if (index === 0) return "Emits a message for each alerted device, at selectable intervals.";
-                  if (index === 1) return "Emits a unique message containing all alerted devices.";
-                  if (index === 2) return "Emits a message containing only the last alerted device.";
-              },
-              icon: "node-alerter-icon.svg",
-              label: function () {
-                  return (this.outputRBE == true ? "|rbe| " : "") + (this.name || this.topic || "KNX Alerter") + (this.inputRBE == true ? " |rbe|" : "")
-              },
-              paletteLabel: "KNX Alerter",
-              oneditprepare: function () {
-                  // Go to the help panel
-                  try {
-                      RED.sidebar.show("help");
-                  } catch (error) { }
-
-                  var node = this;
-                  var oNodeServer = RED.nodes.node($("#node-input-server").val()); // Store the config-node
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: false },
+          name: { value: '' },
+          rules: { value: [] },
+          whentostart: { value: 'ifnewalert' },
+          timerinterval: { value: '2' },
+          initialreadGAInRules: { value: '1' }
+        },
+        inputs: 1,
+        outputs: 3,
+        outputLabels: function (index) {
+          if (index === 0) return 'Emits a message for each alerted device, at selectable intervals.'
+          if (index === 1) return 'Emits a unique message containing all alerted devices.'
+          if (index === 2) return 'Emits a message containing only the last alerted device.'
+        },
+        icon: 'node-alerter-icon.svg',
+        label: function () {
+          return (this.outputRBE == true ? '|rbe| ' : '') + (this.name || this.topic || 'KNX Alerter') + (this.inputRBE == true ? ' |rbe|' : '')
+        },
+        paletteLabel: 'KNX Alerter',
+        oneditprepare: function () {
+          // Go to the help panel
+          try {
+            RED.sidebar.show('help')
+          } catch (error) { }
 
-                  // 19/02/2020 Used to get the server sooner als deploy.
-                  $("#node-input-server").off('.knxUtilityProfile').on('change.knxUtilityProfile', function () {
-                      try {
-                          oNodeServer = RED.nodes.node($(this).val());
-                      } catch (error) { }
-                  });
+          const node = this
+          let oNodeServer = RED.nodes.node($('#node-input-server').val()) // Store the config-node
 
+          // 19/02/2020 Used to get the server sooner als deploy.
+          $('#node-input-server').off('.knxUtilityProfile').on('change.knxUtilityProfile', function () {
+            try {
+              oNodeServer = RED.nodes.node($(this).val())
+            } catch (error) { }
+          })
 
+          // Scene configuration
+          function resizeRule (rule) {
 
+          }
+          $('#node-input-rule-container').css('min-height', '350px').css('min-width', '450px').editableList({
+            addItem: function (container, i, opt) { // row, index, data
+              // opt.r is: { topic: rowRuleTopic, devicename: rowRuleDeviceName, longdevicename: rowRuleLongDeviceName}
 
-                  // Scene configuration
-                  function resizeRule(rule) {
+              const rule = opt.r || { topic: '', devicename: '', longdevicename: '' }
+              if (!opt.hasOwnProperty('i')) {
+                opt._i = Math.floor((0x99999 - 0x10000) * Math.random()).toString()
+              }
+              container.css({
+                overflow: 'hidden',
+                whiteSpace: 'nowrap'
+              })
+              const row = $('<div class="form-row"/>').appendTo(container)
 
-                  }
-                  $("#node-input-rule-container").css('min-height', '350px').css('min-width', '450px').editableList({
-                      addItem: function (container, i, opt) { // row, index, data
+              const oTopicField = $('<input/>', { class: 'rowRuleTopic', type: 'text', placeholder: 'GA or devicename', style: 'width:20%; margin-left: 5px; text-align: left;' }).appendTo(row)
+              const finalspan = $('<span/>', { style: '' }).appendTo(row)
+              finalspan.append(' <span class="node-input-rule-index"></span> ')
+              const orowRuleDeviceName = $('<input/>', { maxlength: '14', class: 'rowRuleDeviceName', type: 'text', style: 'width:30%; margin-left: 0px; text-align: left;font-style: italic;', placeholder: 'Name (max 14 chars)' }).appendTo(row)
+              const orowRuleLongDeviceName = $('<input/>', { class: 'rowRuleLongDeviceName', type: 'text', style: 'width:45%; margin-left: 0px; text-align: left;', placeholder: 'Long name' }).appendTo(row)
 
-                          // opt.r is: { topic: rowRuleTopic, devicename: rowRuleDeviceName, longdevicename: rowRuleLongDeviceName}
+              oTopicField.on('change', function () {
+                resizeRule(container)
+              })
 
-                          var rule = opt.r || { topic: '', devicename: '', longdevicename: '' };
-                          if (!opt.hasOwnProperty('i')) {
-                              opt._i = Math.floor((0x99999 - 0x10000) * Math.random()).toString();
-                          }
-                          container.css({
-                              overflow: 'hidden',
-                              whiteSpace: 'nowrap'
-                          });
-                          var row = $('<div class="form-row"/>').appendTo(container);
-
-                          var oTopicField = $("<input/>", { class: "rowRuleTopic", type: "text", placeholder: "GA or devicename", style: "width:20%; margin-left: 5px; text-align: left;" }).appendTo(row);
-                          var finalspan = $('<span/>', { style: "" }).appendTo(row);
-                          finalspan.append(' <span class="node-input-rule-index"></span> ');
-                          var orowRuleDeviceName = $('<input/>', { maxlength: "14", class: "rowRuleDeviceName", type: "text", style: "width:30%; margin-left: 0px; text-align: left;font-style: italic;", placeholder: "Name (max 14 chars)" }).appendTo(row);
-                          var orowRuleLongDeviceName = $('<input/>', { class: "rowRuleLongDeviceName", type: "text", style: "width:45%; margin-left: 0px; text-align: left;", placeholder: "Long name" }).appendTo(row);
-
-                          oTopicField.on("change", function () {
-                              resizeRule(container);
-                          });
-
-
-                          // Autocomplete suggestion with ETS csv File
-                          oTopicField.autocomplete({
-                              minLength: 0,
-                              source: function (request, response) {
-                                  if (!oNodeServer || !oNodeServer.id) { response([]); return; }
-                                  $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
-                                      response($.map(data, function (value, key) {
-                                          var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                                          if (htmlUtilsfullCSVSearch(sSearch, request.term + " 1.")) {
-                                              return {
-                                                  label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
-                                                  value: value.ga // Value
-                                              }
-                                          } else {
-                                              return null;
-                                          }
-                                      }));
-                                  });
-                              }, select: function (event, ui) {
-                                  // Sets Datapoint and device name automatically
-                                  var sDevName = ui.item.label.split("#")[1].trim();
-                                  try {
-                                      sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
-                                      orowRuleDeviceName.val(sDevName.substr(0, 14));
-                                      orowRuleLongDeviceName.val(sDevName);
-                                  } catch (error) {
-                                  }
-
-                              }
-                          });
-                          oTopicField.on('focus.knxUltimateAlerter click.knxUltimateAlerter', function () {
-                              try {
-                                  $(this).autocomplete('search', '');
-                              } catch (error) { /* empty */ }
-                          });
-                          try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting(oTopicField, oNodeServer.id); } catch (e) {}
-
-                          oTopicField.val(rule.topic);
-                          orowRuleDeviceName.val(rule.devicename);
-                          orowRuleLongDeviceName.val(rule.longdevicename);
-                          oTopicField.change();
-
-                      },
-                      removeItem: function (opt) {
-
-                      },
-                      resizeItem: resizeRule,
-                      sortItems: function (rules) {
-                      },
-                      sortable: true,
-                      removable: true
-                  });
-
-                  // 10/03/2020 For each rule, create a row
-                  for (var i = 0; i < (this.rules || []).length; i++) {
-                      var rule = this.rules[i];
-                      $("#node-input-rule-container").editableList('addItem', { r: rule, i: i });
+              // Autocomplete suggestion with ETS csv File
+              oTopicField.autocomplete({
+                minLength: 0,
+                source: function (request, response) {
+                  if (!oNodeServer || !oNodeServer.id) { response([]); return }
+                  $.getJSON('knxUltimatecsv?nodeID=' + oNodeServer.id, (data) => {
+                    response($.map(data, function (value, key) {
+                      const sSearch = (value.ga + ' (' + value.devicename + ') DPT' + value.dpt)
+                      if (htmlUtilsfullCSVSearch(sSearch, request.term + ' 1.')) {
+                        return {
+                          label: value.ga + ' # ' + value.devicename + ' # ' + value.dpt, // Label for Display
+                          value: value.ga // Value
+                        }
+                      } else {
+                        return null
+                      }
+                    }))
+                  })
+                },
+                select: function (event, ui) {
+                  // Sets Datapoint and device name automatically
+                  let sDevName = ui.item.label.split('#')[1].trim()
+                  try {
+                    sDevName = sDevName.substr(sDevName.indexOf(')') + 1).trim()
+                    orowRuleDeviceName.val(sDevName.substr(0, 14))
+                    orowRuleLongDeviceName.val(sDevName)
+                  } catch (error) {
                   }
+                }
+              })
+              oTopicField.on('focus.knxUltimateAlerter click.knxUltimateAlerter', function () {
+                try {
+                  $(this).autocomplete('search', '')
+                } catch (error) { /* empty */ }
+              })
+              try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting(oTopicField, oNodeServer.id) } catch (e) {}
 
+              oTopicField.val(rule.topic)
+              orowRuleDeviceName.val(rule.devicename)
+              orowRuleLongDeviceName.val(rule.longdevicename)
+              oTopicField.change()
+            },
+            removeItem: function (opt) {
 
-              },
-              oneditsave: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
-
-                  var node = this;
-
-                  var rules = $("#node-input-rule-container").editableList('items');
-                  node.rules = [];
-                  rules.each(function (i) {
-                      var rule = $(this);
-                      var rowRuleTopic = rule.find(".rowRuleTopic").val();
-                      var rowRuleDeviceName = rule.find(".rowRuleDeviceName").val();
-                      var rowRuleLongDeviceName = rule.find(".rowRuleLongDeviceName").val();
-                      node.rules.push({ topic: rowRuleTopic, devicename: rowRuleDeviceName, longdevicename: rowRuleLongDeviceName });
-                  });
-              },
-              oneditcancel: function () {
-                  $("#node-input-server").off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
-              },
-              oneditresize: function (size) {
-                  const list = $("#node-input-rule-container");
-                  const form = $('#dialog-form');
-                  const listTop = list.offset();
-                  const formTop = form.offset();
-                  if (!size || !listTop || !formTop) return;
-                  // The fragment is nested in Utility, so measure the actual list
-                  // offset instead of assuming it is a direct child of dialog-form.
-                  list.editableList('height', Math.max(180, size.height - (listTop.top - formTop.top) - 45));
-              }
+            },
+            resizeItem: resizeRule,
+            sortItems: function (rules) {
+            },
+            sortable: true,
+            removable: true
+          })
+
+          // 10/03/2020 For each rule, create a row
+          for (let i = 0; i < (this.rules || []).length; i++) {
+            const rule = this.rules[i]
+            $('#node-input-rule-container').editableList('addItem', { r: rule, i })
+          }
+        },
+        oneditsave: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+
+          const node = this
+
+          const rules = $('#node-input-rule-container').editableList('items')
+          node.rules = []
+          rules.each(function (i) {
+            const rule = $(this)
+            const rowRuleTopic = rule.find('.rowRuleTopic').val()
+            const rowRuleDeviceName = rule.find('.rowRuleDeviceName').val()
+            const rowRuleLongDeviceName = rule.find('.rowRuleLongDeviceName').val()
+            node.rules.push({ topic: rowRuleTopic, devicename: rowRuleDeviceName, longdevicename: rowRuleLongDeviceName })
           })
+        },
+        oneditcancel: function () {
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
+        },
+        oneditresize: function (size) {
+          const list = $('#node-input-rule-container')
+          const form = $('#dialog-form')
+          const listTop = list.offset()
+          const formTop = form.offset()
+          if (!size || !listTop || !formTop) return
+          // The fragment is nested in Utility, so measure the actual list
+          // offset instead of assuming it is a direct child of dialog-form.
+          list.editableList('height', Math.max(180, size.height - (listTop.top - formTop.top) - 45))
+        }
+      })
     },
     "autoresponder": function (RED) {
       RED.nodes.registerType('knxUltimateAutoResponder', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: true },
-                  name: { value: "Auto responder", required: false },
-                  commandText: {
-                      value: '[]', required: false,
-                      validate: function (value) {
-                          try {
-                              const entries = JSON.parse(value);
-                              return Array.isArray(entries) && entries.every((entry) => (
-                                  entry && typeof entry === 'object' &&
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          name: { value: 'Auto responder', required: false },
+          commandText: {
+            value: '[]',
+            required: false,
+            validate: function (value) {
+              try {
+                const entries = JSON.parse(value)
+                return Array.isArray(entries) && entries.every((entry) => (
+                  entry && typeof entry === 'object' &&
                                   typeof entry.ga === 'string' && entry.ga.trim() !== '' &&
                                   Object.prototype.hasOwnProperty.call(entry, 'default')
-                              ));
-                          } catch (error) { return false; }
-                      }
-                  }
-              },
-              inputs: 0,
-              outputs: 0,
-              icon: "node-knx-icon.svg",
-              label: function () {
-                  return (this.name || "KNX Auto Responder");
-              },
-              paletteLabel: "KNX Auto Responder",
-      	        oneditprepare: function () {
-      	            // Go to the help panel
-      	            try {
-      	                RED.sidebar.show("help");
-      	            } catch (error) { }
-
-      	            var node = this;
-
-      	            $("#node-input-commandText").typedInput({
-      	                type: "json",
-      	                types: ["json"]
-      	            })
-
-      	            try {
-      	                if (node.commandText !== undefined) {
-      	                    $("#node-input-commandText").typedInput('value', node.commandText)
-      	                }
-      	            } catch (error) { }
-
-      	        },
-      	        oneditsave: function () {
-      	            // Return to the info tab
-      	            try {
-      	                RED.sidebar.show("info");
-      	            } catch (error) { }
-
-      	            try {
-      	                this.commandText = $("#node-input-commandText").typedInput('value')
-      	            } catch (error) { }
-
-      	        },
-              oneditcancel: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
+                ))
+              } catch (error) { return false }
+            }
+          }
+        },
+        inputs: 0,
+        outputs: 0,
+        icon: 'node-knx-icon.svg',
+        label: function () {
+          return (this.name || 'KNX Auto Responder')
+        },
+        paletteLabel: 'KNX Auto Responder',
+                  oneditprepare: function () {
+                      // Go to the help panel
+                      try {
+                          RED.sidebar.show('help')
+                      } catch (error) { }
 
+                      const node = this
 
-              }
-          })
+                      $('#node-input-commandText').typedInput({
+                          type: 'json',
+                          types: ['json']
+                      })
+
+                      try {
+                          if (node.commandText !== undefined) {
+                              $('#node-input-commandText').typedInput('value', node.commandText)
+                          }
+                      } catch (error) { }
+                  },
+                  oneditsave: function () {
+                      // Return to the info tab
+                      try {
+                          RED.sidebar.show('info')
+                      } catch (error) { }
+
+                      try {
+                          this.commandText = $('#node-input-commandText').typedInput('value')
+                      } catch (error) { }
+                  },
+        oneditcancel: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+        }
+      })
     },
     "datetime": function (RED) {
       const KNX_ULTIMATE_DATETIME_KEYWORDS = {
-          datetime: [/date\s*\/\s*time/i, /date\s*time/i, /datetime/i, /data\s*\/\s*ora/i, /data\s*ora/i],
-          date: [/\bdate\b/i, /\bdata\b/i, /\bdatum\b/i, /\bfecha\b/i],
-          time: [/\btime\b/i, /\bora\b/i, /\bheure\b/i, /\bzeit\b/i, /\bhora\b/i, /\borologio\b/i, /\bclock\b/i]
-        }
+        datetime: [/date\s*\/\s*time/i, /date\s*time/i, /datetime/i, /data\s*\/\s*ora/i, /data\s*ora/i],
+        date: [/\bdate\b/i, /\bdata\b/i, /\bdatum\b/i, /\bfecha\b/i],
+        time: [/\btime\b/i, /\bora\b/i, /\bheure\b/i, /\bzeit\b/i, /\bhora\b/i, /\borologio\b/i, /\bclock\b/i]
+      }
 
-        const KNX_ULTIMATE_DATETIME_STOPWORDS = new Set([
-          'date', 'datetime', 'time', 'data', 'ora', 'orologio', 'clock', 'bus', 'knx', 'set', 'sync', 'sincro', 'synchronization'
-        ])
-
-        const knxDateTimeNormalizeTokens = (value) => {
-          const str = (value || '').toString().toLowerCase()
-          const cleaned = str
-            .replace(/dpt\s*\d+(\.\d+)?/g, ' ')
-            .replace(/[^a-z0-9]+/g, ' ')
-            .trim()
-          if (!cleaned) return []
-          return cleaned
-            .split(/\s+/)
-            .map((t) => t.trim())
-            .filter((t) => t.length > 1 && !KNX_ULTIMATE_DATETIME_STOPWORDS.has(t))
-        }
+      const KNX_ULTIMATE_DATETIME_STOPWORDS = new Set([
+        'date', 'datetime', 'time', 'data', 'ora', 'orologio', 'clock', 'bus', 'knx', 'set', 'sync', 'sincro', 'synchronization'
+      ])
+
+      const knxDateTimeNormalizeTokens = (value) => {
+        const str = (value || '').toString().toLowerCase()
+        const cleaned = str
+          .replace(/dpt\s*\d+(\.\d+)?/g, ' ')
+          .replace(/[^a-z0-9]+/g, ' ')
+          .trim()
+        if (!cleaned) return []
+        return cleaned
+          .split(/\s+/)
+          .map((t) => t.trim())
+          .filter((t) => t.length > 1 && !KNX_ULTIMATE_DATETIME_STOPWORDS.has(t))
+      }
 
-        const knxDateTimeTokenSimilarity = (aTokens, bTokens) => {
-          if (!Array.isArray(aTokens) || !Array.isArray(bTokens) || aTokens.length === 0 || bTokens.length === 0) return 0
-          const a = new Set(aTokens)
-          const b = new Set(bTokens)
-          let inter = 0
-          a.forEach((t) => { if (b.has(t)) inter += 1 })
-          const union = a.size + b.size - inter
-          return union > 0 ? inter / union : 0
-        }
+      const knxDateTimeTokenSimilarity = (aTokens, bTokens) => {
+        if (!Array.isArray(aTokens) || !Array.isArray(bTokens) || aTokens.length === 0 || bTokens.length === 0) return 0
+        const a = new Set(aTokens)
+        const b = new Set(bTokens)
+        let inter = 0
+        a.forEach((t) => { if (b.has(t)) inter += 1 })
+        const union = a.size + b.size - inter
+        return union > 0 ? inter / union : 0
+      }
 
-        const knxDateTimeParseGA = (ga) => {
-          const parts = (ga || '').toString().trim().split('/')
-          if (parts.length !== 3) return null
-          const nums = parts.map((p) => Number(p))
-          if (nums.some((n) => !Number.isInteger(n) || n < 0)) return null
-          return nums
-        }
+      const knxDateTimeParseGA = (ga) => {
+        const parts = (ga || '').toString().trim().split('/')
+        if (parts.length !== 3) return null
+        const nums = parts.map((p) => Number(p))
+        if (nums.some((n) => !Number.isInteger(n) || n < 0)) return null
+        return nums
+      }
 
-        const knxDateTimeCompareGA = (a, b) => {
-          const aa = knxDateTimeParseGA(a)
-          const bb = knxDateTimeParseGA(b)
-          if (!aa && !bb) return 0
-          if (!aa) return 1
-          if (!bb) return -1
-          for (let i = 0; i < 3; i++) {
-            if (aa[i] !== bb[i]) return aa[i] - bb[i]
-          }
-          return 0
+      const knxDateTimeCompareGA = (a, b) => {
+        const aa = knxDateTimeParseGA(a)
+        const bb = knxDateTimeParseGA(b)
+        if (!aa && !bb) return 0
+        if (!aa) return 1
+        if (!bb) return -1
+        for (let i = 0; i < 3; i++) {
+          if (aa[i] !== bb[i]) return aa[i] - bb[i]
         }
+        return 0
+      }
 
-        const knxGetKnxUltimateConfigs = () => {
-          const configs = []
-          try {
-            if (RED && RED.nodes) {
-              if (typeof RED.nodes.eachConfig === 'function') {
-                RED.nodes.eachConfig((cfg) => {
-                  if (cfg && cfg.type === 'knxUltimate-config') configs.push(cfg)
-                })
-              } else if (typeof RED.nodes.eachNode === 'function') {
-                RED.nodes.eachNode((n) => {
-                  if (n && n.type === 'knxUltimate-config') configs.push(n)
-                })
-              }
-              if (configs.length === 0 && typeof RED.nodes.filterNodes === 'function') {
-                try {
-                  const filtered = RED.nodes.filterNodes({ type: 'knxUltimate-config' })
-                  if (Array.isArray(filtered)) filtered.forEach((n) => configs.push(n))
-                } catch (error) { /* ignore */ }
-              }
+      const knxGetKnxUltimateConfigs = () => {
+        const configs = []
+        try {
+          if (RED && RED.nodes) {
+            if (typeof RED.nodes.eachConfig === 'function') {
+              RED.nodes.eachConfig((cfg) => {
+                if (cfg && cfg.type === 'knxUltimate-config') configs.push(cfg)
+              })
+            } else if (typeof RED.nodes.eachNode === 'function') {
+              RED.nodes.eachNode((n) => {
+                if (n && n.type === 'knxUltimate-config') configs.push(n)
+              })
             }
-          } catch (error) { /* ignore */ }
-          return configs
+            if (configs.length === 0 && typeof RED.nodes.filterNodes === 'function') {
+              try {
+                const filtered = RED.nodes.filterNodes({ type: 'knxUltimate-config' })
+                if (Array.isArray(filtered)) filtered.forEach((n) => configs.push(n))
+              } catch (error) { /* ignore */ }
+            }
+          }
+        } catch (error) { /* ignore */ }
+        return configs
+      }
+
+      const knxFetchGroupAddresses = (serverId) => {
+        return new Promise((resolve) => {
+          if (!serverId) return resolve([])
+          $.getJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
+            resolve(Array.isArray(data) ? data : [])
+          }).fail(() => resolve([]))
+        })
+      }
+
+      const knxScoreEntry = (entry, kind, baseTokens) => {
+        if (!entry) return -1
+        const dpt = (entry.dpt || '').toString()
+        const name = (entry.devicename || '').toString()
+        const tokens = knxDateTimeNormalizeTokens(name)
+
+        let score = 0
+
+        if (kind === 'datetime') {
+          if (dpt === '19.001') score += 60
+          else if (dpt.startsWith('19.')) score += 45
+          KNX_ULTIMATE_DATETIME_KEYWORDS.datetime.forEach((re) => { if (re.test(name)) score += 20 })
+          KNX_ULTIMATE_DATETIME_KEYWORDS.time.forEach((re) => { if (re.test(name)) score += 6 })
+          KNX_ULTIMATE_DATETIME_KEYWORDS.date.forEach((re) => { if (re.test(name)) score += 6 })
+        } else if (kind === 'date') {
+          if (dpt === '11.001') score += 60
+          else if (dpt.startsWith('11.')) score += 45
+          KNX_ULTIMATE_DATETIME_KEYWORDS.date.forEach((re) => { if (re.test(name)) score += 18 })
+        } else if (kind === 'time') {
+          if (dpt === '10.001') score += 60
+          else if (dpt.startsWith('10.')) score += 45
+          KNX_ULTIMATE_DATETIME_KEYWORDS.time.forEach((re) => { if (re.test(name)) score += 18 })
         }
 
-        const knxFetchGroupAddresses = (serverId) => {
-          return new Promise((resolve) => {
-            if (!serverId) return resolve([])
-            $.getJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
-              resolve(Array.isArray(data) ? data : [])
-            }).fail(() => resolve([]))
-          })
+        if (Array.isArray(baseTokens) && baseTokens.length > 0) {
+          score += Math.round(knxDateTimeTokenSimilarity(tokens, baseTokens) * 30)
         }
 
-        const knxScoreEntry = (entry, kind, baseTokens) => {
-          if (!entry) return -1
-          const dpt = (entry.dpt || '').toString()
-          const name = (entry.devicename || '').toString()
-          const tokens = knxDateTimeNormalizeTokens(name)
-
-          let score = 0
-
-          if (kind === 'datetime') {
-            if (dpt === '19.001') score += 60
-            else if (dpt.startsWith('19.')) score += 45
-            KNX_ULTIMATE_DATETIME_KEYWORDS.datetime.forEach((re) => { if (re.test(name)) score += 20 })
-            KNX_ULTIMATE_DATETIME_KEYWORDS.time.forEach((re) => { if (re.test(name)) score += 6 })
-            KNX_ULTIMATE_DATETIME_KEYWORDS.date.forEach((re) => { if (re.test(name)) score += 6 })
-          } else if (kind === 'date') {
-            if (dpt === '11.001') score += 60
-            else if (dpt.startsWith('11.')) score += 45
-            KNX_ULTIMATE_DATETIME_KEYWORDS.date.forEach((re) => { if (re.test(name)) score += 18 })
-          } else if (kind === 'time') {
-            if (dpt === '10.001') score += 60
-            else if (dpt.startsWith('10.')) score += 45
-            KNX_ULTIMATE_DATETIME_KEYWORDS.time.forEach((re) => { if (re.test(name)) score += 18 })
-          }
+        return score
+      }
 
-          if (Array.isArray(baseTokens) && baseTokens.length > 0) {
-            score += Math.round(knxDateTimeTokenSimilarity(tokens, baseTokens) * 30)
+      const knxPickBest = (entries, kind, baseTokens) => {
+        if (!Array.isArray(entries) || entries.length === 0) return null
+        let best = null
+        let bestScore = -1
+        entries.forEach((e) => {
+          const s = knxScoreEntry(e, kind, baseTokens)
+          if (s > bestScore) {
+            bestScore = s
+            best = e
+          } else if (s === bestScore && best) {
+            const cmp = knxDateTimeCompareGA(e.ga, best.ga)
+            if (cmp < 0) best = e
           }
+        })
+        return best
+      }
 
-          return score
+      const knxSuggestFromCsv = (csvRows) => {
+        const rows = Array.isArray(csvRows) ? csvRows : []
+        const datetimeRows = rows.filter((r) => (r && typeof r.dpt === 'string' && r.dpt.startsWith('19.')))
+        const dateRows = rows.filter((r) => (r && typeof r.dpt === 'string' && r.dpt.startsWith('11.')))
+        const timeRows = rows.filter((r) => (r && typeof r.dpt === 'string' && r.dpt.startsWith('10.')))
+
+        const bestDateTime = knxPickBest(datetimeRows, 'datetime', [])
+        const baseTokens = bestDateTime ? knxDateTimeNormalizeTokens(bestDateTime.devicename || '') : []
+
+        const bestDate = knxPickBest(dateRows, 'date', baseTokens)
+        const bestTime = knxPickBest(timeRows, 'time', baseTokens)
+
+        return {
+          dateTime: bestDateTime,
+          date: bestDate,
+          time: bestTime
         }
+      }
 
-        const knxPickBest = (entries, kind, baseTokens) => {
-          if (!Array.isArray(entries) || entries.length === 0) return null
-          let best = null
-          let bestScore = -1
-          entries.forEach((e) => {
-            const s = knxScoreEntry(e, kind, baseTokens)
-            if (s > bestScore) {
-              bestScore = s
-              best = e
-            } else if (s === bestScore && best) {
-              const cmp = knxDateTimeCompareGA(e.ga, best.ga)
-              if (cmp < 0) best = e
+      const knxAutoConfigureDateTimeNode = async (node, { updateDom = false, preferExistingServer = true, canApply = () => true } = {}) => {
+        try {
+          if (!node || !canApply()) return
+
+          const hasAnyGA = !!((node.gaDateTime || '').trim() || (node.gaDate || '').trim() || (node.gaTime || '').trim())
+          if (hasAnyGA) return
+
+          // If server already selected and it has ETS rows, reuse it.
+          const currentServerId = preferExistingServer ? (node.server || '') : ''
+          if (currentServerId && currentServerId !== '_ADD_') {
+            const rows = await knxFetchGroupAddresses(currentServerId)
+            if (rows.length > 0) {
+              const suggestions = knxSuggestFromCsv(rows)
+              return knxApplySuggestions(node, currentServerId, suggestions, { updateDom, canApply })
             }
+          }
+
+          // Otherwise, select the first knxUltimate-config that has an ETS CSV imported (non-empty parsed GA list).
+          const configs = knxGetKnxUltimateConfigs()
+          if (configs.length === 0) return
+
+          // Fast path: config node already carries an ETS file/path in its `csv` property.
+          for (let i = 0; i < configs.length; i++) {
+            const cfg = configs[i]
+            const id = cfg && cfg.id ? cfg.id : null
+            const csvHint = cfg && typeof cfg.csv === 'string' ? cfg.csv.trim() : ''
+            if (!id || !csvHint) continue
+            const rows = await knxFetchGroupAddresses(id)
+            if (rows.length === 0) continue
+            const suggestions = knxSuggestFromCsv(rows)
+            return knxApplySuggestions(node, id, suggestions, { updateDom, canApply })
+          }
+
+          const maxCandidates = Math.min(10, configs.length)
+          const checks = configs.slice(0, maxCandidates).map((cfg) => {
+            const id = cfg && cfg.id ? cfg.id : null
+            return knxFetchGroupAddresses(id).then((rows) => ({ id, rows }))
           })
-          return best
+          const results = await Promise.all(checks)
+
+          let selected = null
+          for (let i = 0; i < results.length; i++) {
+            if (results[i] && results[i].id && Array.isArray(results[i].rows) && results[i].rows.length > 0) {
+              selected = results[i]
+              break
+            }
+          }
+          if (!selected) return
+
+          const suggestions = knxSuggestFromCsv(selected.rows)
+          return knxApplySuggestions(node, selected.id, suggestions, { updateDom, canApply })
+        } catch (error) {
+          try { console.warn('knxUltimateDateTime auto-config failed', error) } catch (e) { /* ignore */ }
         }
+      }
+
+      const knxAutoConfigureDateTimeNodeForServer = async (node, serverId, { updateDom = false, overwrite = false, canApply = () => true } = {}) => {
+        try {
+          if (!node || !serverId || !canApply()) return
+          const rows = await knxFetchGroupAddresses(serverId)
+          if (!Array.isArray(rows) || rows.length === 0) return
+          const suggestions = knxSuggestFromCsv(rows)
+          return knxApplySuggestions(node, serverId, suggestions, { updateDom, overwrite, canApply })
+        } catch (error) {
+          try { console.warn('knxUltimateDateTime auto-config for server failed', error) } catch (e) { /* ignore */ }
+        }
+      }
 
-        const knxSuggestFromCsv = (csvRows) => {
-          const rows = Array.isArray(csvRows) ? csvRows : []
-          const datetimeRows = rows.filter((r) => (r && typeof r.dpt === 'string' && r.dpt.startsWith('19.')))
-          const dateRows = rows.filter((r) => (r && typeof r.dpt === 'string' && r.dpt.startsWith('11.')))
-          const timeRows = rows.filter((r) => (r && typeof r.dpt === 'string' && r.dpt.startsWith('10.')))
+      const knxApplySuggestions = (node, serverId, suggestions, { updateDom = false, overwrite = false, canApply = () => true } = {}) => {
+        // The Utility wrapper can replace this fragment while ETS requests are in
+        // flight. Never let a late response update its successor's fields.
+        if (!node || !serverId || !canApply()) return
+        if (!suggestions) return
 
-          const bestDateTime = knxPickBest(datetimeRows, 'datetime', [])
-          const baseTokens = bestDateTime ? knxDateTimeNormalizeTokens(bestDateTime.devicename || '') : []
+        // Avoid repeating the same automation multiple times.
+        if (node._knxDateTimeAutoConfigured === true && overwrite !== true) return
 
-          const bestDate = knxPickBest(dateRows, 'date', baseTokens)
-          const bestTime = knxPickBest(timeRows, 'time', baseTokens)
+        node.server = serverId
 
-          return {
-            dateTime: bestDateTime,
-            date: bestDate,
-            time: bestTime
-          }
+        if (suggestions.dateTime && suggestions.dateTime.ga && (overwrite || !(node.gaDateTime || '').trim())) {
+          node.gaDateTime = suggestions.dateTime.ga
+          node.nameDateTime = suggestions.dateTime.devicename || ''
+        }
+        if (suggestions.date && suggestions.date.ga && (overwrite || !(node.gaDate || '').trim())) {
+          node.gaDate = suggestions.date.ga
+          node.nameDate = suggestions.date.devicename || ''
+        }
+        if (suggestions.time && suggestions.time.ga && (overwrite || !(node.gaTime || '').trim())) {
+          node.gaTime = suggestions.time.ga
+          node.nameTime = suggestions.time.devicename || ''
+        }
+
+        node._knxDateTimeAutoConfigured = true
+        node._knxDateTimeAutoConfiguredServer = serverId
+
+        if (updateDom) {
+          try {
+            $('#node-input-server').val(serverId).trigger('change')
+            if (node.gaDateTime) $('#node-input-gaDateTime').val(node.gaDateTime)
+            if (node.nameDateTime) $('#node-input-nameDateTime').val(node.nameDateTime)
+            if (node.gaDate) $('#node-input-gaDate').val(node.gaDate)
+            if (node.nameDate) $('#node-input-nameDate').val(node.nameDate)
+            if (node.gaTime) $('#node-input-gaTime').val(node.gaTime)
+            if (node.nameTime) $('#node-input-nameTime').val(node.nameTime)
+          } catch (error) { /* ignore */ }
+        } else {
+          try {
+            if (RED && RED.nodes && typeof RED.nodes.dirty === 'function') RED.nodes.dirty(true)
+          } catch (error) { /* ignore */ }
+          try { if (RED && RED.view && typeof RED.view.redraw === 'function') RED.view.redraw() } catch (error) { /* ignore */ }
+        }
+      }
+
+      const knxDateTimeOptionalNumber = (toggle) => function (value) {
+        let enabled = this[toggle] === undefined || this[toggle] === true || this[toggle] === 'true'
+        // The wrapper validates the saved node while its draft is open. Read the
+        // active checkbox only in that case; unrelated nodes use their saved flag.
+        if (this._utilityEditor && typeof $ === 'function') {
+          const field = $('#node-input-' + toggle)
+          if (field.length) enabled = field.is(':checked')
         }
+        return !enabled || RED.validators.number()(value)
+      }
 
-        const knxAutoConfigureDateTimeNode = async (node, { updateDom = false, preferExistingServer = true, canApply = () => true } = {}) => {
+      RED.nodes.registerType('knxUltimateDateTime', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          name: { value: '' },
+          outputtopic: { value: '' },
+          gaDateTime: { value: '' },
+          nameDateTime: { value: '' },
+          dptDateTime: { value: '19.001' },
+          gaDate: { value: '' },
+          nameDate: { value: '' },
+          dptDate: { value: '11.001' },
+          gaTime: { value: '' },
+          nameTime: { value: '' },
+          dptTime: { value: '10.001' },
+          sendOnDeploy: { value: true },
+          sendOnDeployDelay: { value: 30, validate: knxDateTimeOptionalNumber('sendOnDeploy') },
+          periodicSend: { value: true },
+          periodicSendInterval: { value: 60, validate: knxDateTimeOptionalNumber('periodicSend') },
+          periodicSendUnit: { value: 'm' }
+        },
+        inputs: 0,
+        outputs: 0,
+        icon: 'node-knx-icon.svg',
+        label: function () {
+          return this.name || 'KNX DateTime'
+        },
+        paletteLabel: function () {
           try {
-            if (!node || !canApply()) return
-
-            const hasAnyGA = !!((node.gaDateTime || '').trim() || (node.gaDate || '').trim() || (node.gaTime || '').trim())
-            if (hasAnyGA) return
-
-            // If server already selected and it has ETS rows, reuse it.
-            const currentServerId = preferExistingServer ? (node.server || '') : ''
-            if (currentServerId && currentServerId !== '_ADD_') {
-              const rows = await knxFetchGroupAddresses(currentServerId)
-              if (rows.length > 0) {
-                const suggestions = knxSuggestFromCsv(rows)
-                return knxApplySuggestions(node, currentServerId, suggestions, { updateDom, canApply })
+            return RED._('node-red-contrib-knx-ultimate/knxUltimateDateTime:knxUltimateDateTime.paletteLabel') || 'DateTime'
+          } catch (error) {
+            return 'DateTime'
+          }
+        },
+        onadd: function () {
+          // Auto-select a KNX gateway (first one with ETS CSV imported) and prefill coherent group addresses.
+          // This runs when the node is dragged from the palette. Best-effort, non-blocking.
+          const node = this
+          setTimeout(() => {
+            knxAutoConfigureDateTimeNode(node, {
+              updateDom: false,
+              preferExistingServer: true,
+              canApply: () => node.utilityType === 'datetime'
+            })
+          }, 50)
+        },
+        button: {
+          enabled: function () {
+            return !this.changed
+          },
+          visible: function () {
+            return true
+          },
+          onclick: function () {
+            const node = this
+            $.ajax({
+              type: 'POST',
+              url: 'knxUltimateUtility/sendNow',
+              data: { id: node.id },
+              success: function (response) {
+                const queued = response && response.queued === true
+                const message = queued
+                  ? (RED._('node-red-contrib-knx-ultimate/knxUltimateDateTime:knxUltimateDateTime.notifyQueued') || 'Queued (gateway not connected yet)')
+                  : (RED._('node-red-contrib-knx-ultimate/knxUltimateDateTime:knxUltimateDateTime.notifySent') || 'Sent to KNX')
+                RED.notify(message, 'success')
+              },
+              error: function (xhr) {
+                let message = 'Error'
+                try {
+                  if (xhr && xhr.responseJSON && xhr.responseJSON.error) message = xhr.responseJSON.error
+                } catch (error) { /* ignore */ }
+                RED.notify(message, 'error')
               }
-            }
+            })
+          }
+        },
+        oneditprepare: function () {
+          const node = this
+          if (node._knxDateTimeEditorSession) node._knxDateTimeEditorSession.active = false
+          const editorSession = { active: true }
+          node._knxDateTimeEditorSession = editorSession
+          const $knxServerInput = $('#node-input-server')
+          const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none'])
+          const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map())
+
+          try { RED.sidebar.show('help') } catch (error) { /* ignore */ }
+
+          const resolveKnxServerValue = () => {
+            const domValue = $knxServerInput.val()
+            if (domValue !== undefined && domValue !== null && domValue !== '') return domValue
+            if (node.server !== undefined && node.server !== null && node.server !== '') return node.server
+            return ''
+          }
 
-            // Otherwise, select the first knxUltimate-config that has an ETS CSV imported (non-empty parsed GA list).
-            const configs = knxGetKnxUltimateConfigs()
-            if (configs.length === 0) return
-
-            // Fast path: config node already carries an ETS file/path in its `csv` property.
-            for (let i = 0; i < configs.length; i++) {
-              const cfg = configs[i]
-              const id = cfg && cfg.id ? cfg.id : null
-              const csvHint = cfg && typeof cfg.csv === 'string' ? cfg.csv.trim() : ''
-              if (!id || !csvHint) continue
-              const rows = await knxFetchGroupAddresses(id)
-              if (rows.length === 0) continue
-              const suggestions = knxSuggestFromCsv(rows)
-              return knxApplySuggestions(node, id, suggestions, { updateDom, canApply })
-            }
+          const addressFields = ['gaDateTime', 'nameDateTime', 'dptDateTime', 'gaDate', 'nameDate', 'dptDate', 'gaTime', 'nameTime', 'dptTime']
+          const addressSnapshot = () => JSON.stringify(addressFields.map((field) => $('#node-input-' + field).val() || ''))
+
+          const hasKnxServerSelected = () => {
+            const val = resolveKnxServerValue()
+            return !(val === undefined || val === null || KNX_EMPTY_VALUES.has(String(val)))
+          }
 
-            const maxCandidates = Math.min(10, configs.length)
-            const checks = configs.slice(0, maxCandidates).map((cfg) => {
-              const id = cfg && cfg.id ? cfg.id : null
-              return knxFetchGroupAddresses(id).then((rows) => ({ id, rows }))
+          const fetchGroupAddresses = (serverId) => {
+            if (!serverId) return Promise.resolve([])
+            if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId))
+            return new Promise((resolve) => {
+              $.getJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
+                const list = Array.isArray(data) ? data : []
+                KNX_GA_CACHE.set(serverId, list)
+                resolve(list)
+              }).fail(() => resolve([]))
             })
-            const results = await Promise.all(checks)
+          }
+
+          const setupGA = (gaSelector, nameSelector, dptSelector, allowedPrefixes, defaultDpt) => {
+            const $gaInput = $(gaSelector)
+            const $nameInput = $(nameSelector)
+            const $dptInput = $(dptSelector)
+            if (!$gaInput.length) return
 
-            let selected = null
-            for (let i = 0; i < results.length; i++) {
-              if (results[i] && results[i].id && Array.isArray(results[i].rows) && results[i].rows.length > 0) {
-                selected = results[i]
-                break
+            if ($dptInput.length && (!$dptInput.val() || $dptInput.val() === '')) $dptInput.val(defaultDpt)
+
+            const sourceFn = (request, response) => {
+              if (!hasKnxServerSelected()) {
+                response([])
+                return
               }
+              const serverId = resolveKnxServerValue()
+              fetchGroupAddresses(serverId).then((data) => {
+                if (!editorSession.active || resolveKnxServerValue() !== serverId) return
+                const items = []
+                data.forEach((entry) => {
+                  const dpt = entry.dpt || ''
+                  const allowed = allowedPrefixes.some((prefix) => prefix === '' || dpt.startsWith(prefix))
+                  if (!allowed) return
+                  const devName = entry.devicename || ''
+                  const searchStr = `${entry.ga} (${devName}) DPT${dpt}`
+                  if (!htmlUtilsfullCSVSearch(searchStr, request.term || '')) return
+                  items.push({
+                    label: `${entry.ga} # ${devName} # ${dpt}`,
+                    value: entry.ga,
+                    ga: entry.ga
+                  })
+                })
+                response(items)
+              })
             }
-            if (!selected) return
 
-            const suggestions = knxSuggestFromCsv(selected.rows)
-            return knxApplySuggestions(node, selected.id, suggestions, { updateDom, canApply })
-          } catch (error) {
-            try { console.warn('knxUltimateDateTime auto-config failed', error) } catch (e) { /* ignore */ }
+            if ($gaInput.data('knx-ga-initialised')) {
+              $gaInput.autocomplete('option', 'source', sourceFn)
+            } else {
+              $gaInput
+                .autocomplete({
+                  minLength: 0,
+                  source: sourceFn,
+                  select: (event, ui) => {
+                    let deviceName = ''
+                    try {
+                      deviceName = ui.item.label.split('#')[1].trim()
+                    } catch (error) { deviceName = '' }
+                    if ($nameInput.length) {
+                      $nameInput.val(deviceName || '')
+                    }
+                    try {
+                      const parts = ui.item.label.split('#')
+                      const dptFromLabel = parts.length >= 3 ? parts[2].trim() : ''
+                      $dptInput.val(dptFromLabel || defaultDpt)
+                    } catch (error) {
+                      $dptInput.val(defaultDpt)
+                    }
+                  }
+                })
+                .on('focus.knxUltimateDateTime click.knxUltimateDateTime', function () {
+                  const currentValue = $(this).val() || ''
+                  try { $(this).autocomplete('search', `${currentValue} exactmatch`) } catch (error) { /* ignore */ }
+                })
+              $gaInput.data('knx-ga-initialised', true)
+            }
+
+            try {
+              if (hasKnxServerSelected()) {
+                const srv = RED.nodes.node(resolveKnxServerValue())
+                if (srv && srv.id) KNX_enableSecureFormatting($gaInput, srv.id)
+              }
+            } catch (error) { /* ignore */ }
           }
-        }
 
-        const knxAutoConfigureDateTimeNodeForServer = async (node, serverId, { updateDom = false, overwrite = false, canApply = () => true } = {}) => {
-          try {
-            if (!node || !serverId || !canApply()) return
-            const rows = await knxFetchGroupAddresses(serverId)
-            if (!Array.isArray(rows) || rows.length === 0) return
-            const suggestions = knxSuggestFromCsv(rows)
-            return knxApplySuggestions(node, serverId, suggestions, { updateDom, overwrite, canApply })
-          } catch (error) {
-            try { console.warn('knxUltimateDateTime auto-config for server failed', error) } catch (e) { /* ignore */ }
+          const refresh = () => {
+            setupGA('#node-input-gaDateTime', '#node-input-nameDateTime', '#node-input-dptDateTime', ['19.'], '19.001')
+            setupGA('#node-input-gaDate', '#node-input-nameDate', '#node-input-dptDate', ['11.'], '11.001')
+            setupGA('#node-input-gaTime', '#node-input-nameTime', '#node-input-dptTime', ['10.'], '10.001')
           }
-        }
 
-        const knxApplySuggestions = (node, serverId, suggestions, { updateDom = false, overwrite = false, canApply = () => true } = {}) => {
-          // The Utility wrapper can replace this fragment while ETS requests are in
-          // flight. Never let a late response update its successor's fields.
-          if (!node || !serverId || !canApply()) return
-          if (!suggestions) return
+          $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
+            KNX_GA_CACHE.clear()
+            refresh()
+            try {
+              const sid = resolveKnxServerValue()
+              if (!sid || sid === '_ADD_') return
+              const hasAnyGAInUi = !!(
+                ($('#node-input-gaDateTime').val() || '').toString().trim() ||
+                  ($('#node-input-gaDate').val() || '').toString().trim() ||
+                  ($('#node-input-gaTime').val() || '').toString().trim()
+              )
+              // If the current values were auto-filled, allow overwrite when server changes.
+              const shouldOverwrite = node._knxDateTimeAutoConfigured === true && node._knxDateTimeAutoConfiguredServer && node._knxDateTimeAutoConfiguredServer !== sid
+              const beforeRequest = addressSnapshot()
+              // Otherwise fill only empty fields (do not override manual config).
+              knxAutoConfigureDateTimeNodeForServer(node, sid, {
+                updateDom: true,
+                overwrite: shouldOverwrite || !hasAnyGAInUi,
+                canApply: () => editorSession.active && resolveKnxServerValue() === sid && addressSnapshot() === beforeRequest
+              })
+            } catch (error) { /* ignore */ }
+          })
 
-          // Avoid repeating the same automation multiple times.
-          if (node._knxDateTimeAutoConfigured === true && overwrite !== true) return
+          refresh()
 
-          node.server = serverId
+          // Auto-select server + fill GAs only for a brand new node (all GAs empty).
+          const initialServer = resolveKnxServerValue()
+          const initialAddresses = addressSnapshot()
+          editorSession.timer = setTimeout(() => {
+            knxAutoConfigureDateTimeNode(node, {
+              updateDom: true,
+              preferExistingServer: true,
+              canApply: () => editorSession.active && resolveKnxServerValue() === initialServer && addressSnapshot() === initialAddresses
+            })
+          }, 50)
 
-          if (suggestions.dateTime && suggestions.dateTime.ga && (overwrite || !(node.gaDateTime || '').trim())) {
-            node.gaDateTime = suggestions.dateTime.ga
-            node.nameDateTime = suggestions.dateTime.devicename || ''
+          const syncUi = () => {
+            const sendOnDeploy = $('#node-input-sendOnDeploy').is(':checked')
+            $('.knx-datetime-deploy-options').toggle(sendOnDeploy)
+            const periodicSend = $('#node-input-periodicSend').is(':checked')
+            $('.knx-datetime-periodic-options').toggle(periodicSend)
           }
-          if (suggestions.date && suggestions.date.ga && (overwrite || !(node.gaDate || '').trim())) {
-            node.gaDate = suggestions.date.ga
-            node.nameDate = suggestions.date.devicename || ''
+
+          $('#node-input-sendOnDeploy').on('change.knxUtilityProfile', syncUi)
+          $('#node-input-periodicSend').on('change.knxUtilityProfile', syncUi)
+          syncUi()
+        },
+        oneditcancel: function () {
+          const session = this._knxDateTimeEditorSession
+          if (session) {
+            session.active = false
+            clearTimeout(session.timer)
           }
-          if (suggestions.time && suggestions.time.ga && (overwrite || !(node.gaTime || '').trim())) {
-            node.gaTime = suggestions.time.ga
-            node.nameTime = suggestions.time.devicename || ''
+          $('#node-input-server').off('.knxUtilityProfile')
+          $('#node-input-sendOnDeploy').off('.knxUtilityProfile')
+          $('#node-input-periodicSend').off('.knxUtilityProfile')
+        }
+      })
+    },
+    "watchdog": function (RED) {
+      const utilityFieldValue = (node, key) => {
+        if (node._utilityEditor && typeof $ === 'function') {
+          const field = $('#node-input-' + key)
+          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val()
+        }
+        return node[key]
+      }
+      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
+        if (!enabled(this)) return true
+        const numeric = Number(value)
+        return value !== null && value !== undefined && String(value).trim() !== '' &&
+          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric))
+      }
+
+      RED.nodes.registerType('knxUltimateWatchDog', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          topic: { value: '12/0/0' },
+          maxRetry: { value: 6, validate: utilityNumber(0, true) }, // Zero reports failure on the first unsuccessful check.
+          retryInterval: { value: 10, validate: utilityNumber(0.001) },
+          name: { value: '' },
+          autoStart: { value: true },
+          listenToKnxUltimateNodeErrors: { value: true },
+          checkLevel: { value: 'Ethernet' }
+        },
+        inputs: 1,
+        outputs: 1,
+        outputLabels: ['Output'],
+        icon: 'node-watchdog-icon.svg',
+        label: function () {
+          return ((this.name || 'KNX Watchdog') + ' ' + (this.checkLevel == 'Ethernet' ? 'Gateway IP' : this.topic))
+        },
+        paletteLabel: 'KNX WatchDog',
+        oneditprepare: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          const editorSession = { active: true }
+          this._knxUtilityProfileSession = editorSession
+          // Ignore responses belonging to a closed editor or a previous gateway.
+          const profileGetJSON = (url, callback) => {
+            const serverId = $('#node-input-server').val()
+            return $.getJSON(url, (data) => {
+              if (editorSession.active && $('#node-input-server').val() === serverId) callback(data)
+            })
           }
+          const node = this
+          const $knxServerInput = $('#node-input-server')
+          const $gaInput = $('#node-input-topic')
+          const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none'])
 
-          node._knxDateTimeAutoConfigured = true
-          node._knxDateTimeAutoConfiguredServer = serverId
+          // Go to the help panel
+          try {
+            RED.sidebar.show('help')
+          } catch (error) { }
+
+          $('#advancedOptionsAccordion').accordion({
+            header: 'h3',
+            heightStyle: 'content',
+            collapsible: true,
+            active: false
+          })
 
-          if (updateDom) {
-            try {
-              $('#node-input-server').val(serverId).trigger('change')
-              if (node.gaDateTime) $('#node-input-gaDateTime').val(node.gaDateTime)
-              if (node.nameDateTime) $('#node-input-nameDateTime').val(node.nameDateTime)
-              if (node.gaDate) $('#node-input-gaDate').val(node.gaDate)
-              if (node.nameDate) $('#node-input-nameDate').val(node.nameDate)
-              if (node.gaTime) $('#node-input-gaTime').val(node.gaTime)
-              if (node.nameTime) $('#node-input-nameTime').val(node.nameTime)
-            } catch (error) { /* ignore */ }
-          } else {
-            try {
-              if (RED && RED.nodes && typeof RED.nodes.dirty === 'function') RED.nodes.dirty(true)
-            } catch (error) { /* ignore */ }
-            try { if (RED && RED.view && typeof RED.view.redraw === 'function') RED.view.redraw() } catch (error) { /* ignore */ }
+          const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map())
+
+          const resolveKnxServerValue = () => {
+            const domValue = $knxServerInput.val()
+            if (domValue !== undefined && domValue !== null) {
+              return KNX_EMPTY_VALUES.has(String(domValue)) ? '' : domValue
+            }
+            if (node.server !== undefined && node.server !== null && !KNX_EMPTY_VALUES.has(String(node.server))) {
+              return node.server
+            }
+            return ''
           }
-        }
 
-        const knxDateTimeOptionalNumber = (toggle) => function (value) {
-          let enabled = this[toggle] === undefined || this[toggle] === true || this[toggle] === 'true';
-          // The wrapper validates the saved node while its draft is open. Read the
-          // active checkbox only in that case; unrelated nodes use their saved flag.
-          if (this._utilityEditor && typeof $ === 'function') {
-            const field = $('#node-input-' + toggle)
-            if (field.length) enabled = field.is(':checked')
+          const fetchGroupAddresses = (serverId) => {
+            if (!serverId) return Promise.resolve([])
+            if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId))
+            return new Promise((resolve) => {
+              profileGetJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
+                const list = Array.isArray(data) ? data : []
+                KNX_GA_CACHE.set(serverId, list)
+                resolve(list)
+              }).fail(() => resolve([]))
+            })
           }
-          return !enabled || RED.validators.number()(value)
-        }
 
-        RED.nodes.registerType('knxUltimateDateTime', {
-          category: 'KNX Ultimate',
-          color: '#C7E9C0',
-          defaults: {
-            server: { type: 'knxUltimate-config', required: true },
-            name: { value: '' },
-            outputtopic: { value: '' },
-            gaDateTime: { value: '' },
-            nameDateTime: { value: '' },
-            dptDateTime: { value: '19.001' },
-            gaDate: { value: '' },
-            nameDate: { value: '' },
-            dptDate: { value: '11.001' },
-            gaTime: { value: '' },
-            nameTime: { value: '' },
-            dptTime: { value: '10.001' },
-            sendOnDeploy: { value: true },
-            sendOnDeployDelay: { value: 30, validate: knxDateTimeOptionalNumber('sendOnDeploy') },
-            periodicSend: { value: true },
-            periodicSendInterval: { value: 60, validate: knxDateTimeOptionalNumber('periodicSend') },
-            periodicSendUnit: { value: 'm' }
-          },
-          inputs: 0,
-          outputs: 0,
-          icon: 'node-knx-icon.svg',
-          label: function () {
-            return this.name || 'KNX DateTime'
-          },
-          paletteLabel: function () {
-            try {
-              return RED._('node-red-contrib-knx-ultimate/knxUltimateDateTime:knxUltimateDateTime.paletteLabel') || 'DateTime'
-            } catch (error) {
-              return 'DateTime'
+          const ensureGaAutocomplete = () => {
+            const serverId = resolveKnxServerValue()
+            if (!serverId) {
+              if ($gaInput.data('ui-autocomplete')) {
+                $gaInput.autocomplete('disable')
+              }
+              return
             }
-          },
-          onadd: function () {
-            // Auto-select a KNX gateway (first one with ETS CSV imported) and prefill coherent group addresses.
-            // This runs when the node is dragged from the palette. Best-effort, non-blocking.
-            const node = this
-            setTimeout(() => {
-              knxAutoConfigureDateTimeNode(node, {
-                updateDom: false,
-                preferExistingServer: true,
-                canApply: () => node.utilityType === 'datetime'
+
+            const sourceFn = (request, response) => {
+              fetchGroupAddresses(serverId).then((data) => {
+                if (!editorSession.active || resolveKnxServerValue() !== serverId) return
+                const items = [];
+                (data || []).forEach((entry) => {
+                  const dpt = typeof entry.dpt === 'string' ? entry.dpt : ''
+                  if (!dpt.startsWith('1.')) return // Watchdog only accepts boolean GAs
+                  const devName = entry.devicename || ''
+                  const searchStr = `${entry.ga} (${devName}) DPT${dpt}`
+                  if (!htmlUtilsfullCSVSearch(searchStr, request.term || '')) return
+                  items.push({
+                    label: `${entry.ga} # ${devName} # ${dpt}`,
+                    value: entry.ga
+                  })
+                })
+                response(items)
               })
-            }, 50)
-          },
-          button: {
-            enabled: function () {
-              return !this.changed
-            },
-            visible: function () {
-              return true
-            },
-            onclick: function () {
-              const node = this
-              $.ajax({
-                type: 'POST',
-                url: 'knxUltimateUtility/sendNow',
-                data: { id: node.id },
-                success: function (response) {
-                  const queued = response && response.queued === true
-                  const message = queued
-                    ? (RED._('node-red-contrib-knx-ultimate/knxUltimateDateTime:knxUltimateDateTime.notifyQueued') || 'Queued (gateway not connected yet)')
-                    : (RED._('node-red-contrib-knx-ultimate/knxUltimateDateTime:knxUltimateDateTime.notifySent') || 'Sent to KNX')
-                  RED.notify(message, 'success')
-                },
-                error: function (xhr) {
-                  let message = 'Error'
-                  try {
-                    if (xhr && xhr.responseJSON && xhr.responseJSON.error) message = xhr.responseJSON.error
-                  } catch (error) { /* ignore */ }
-                  RED.notify(message, 'error')
+            }
+
+            if ($gaInput.data('knx-watchdog-ga')) {
+              $gaInput.autocomplete('option', 'source', sourceFn)
+              $gaInput.autocomplete('enable')
+            } else {
+              $gaInput.autocomplete({
+                minLength: 0,
+                source: sourceFn,
+                select: function (event, ui) {
+                  event.preventDefault()
+                  $(this).val(ui.item.value)
+                  const parts = ui.item.label.split('#')
+                  let deviceName = (parts[1] || '').trim().replace(/^\)/, '').trim()
+                  if (deviceName.indexOf('/') > -1) {
+                    deviceName = deviceName.split('/').pop().trim()
+                  }
+                  const $nameInput = $('#node-input-name')
+                  if (deviceName && $nameInput.length) {
+                    $nameInput.val(deviceName)
+                  }
                 }
+              }).on('focus.knxUltimateWatchDog click.knxUltimateWatchDog', function () {
+                const currentValue = $(this).val() || ''
+                try {
+                  $(this).autocomplete('search', currentValue ? `${currentValue} exactmatch` : '')
+                } catch (error) { }
               })
+              $gaInput.data('knx-watchdog-ga', true)
             }
-          },
-          oneditprepare: function () {
-            const node = this
-            if (node._knxDateTimeEditorSession) node._knxDateTimeEditorSession.active = false
-            const editorSession = { active: true }
-            node._knxDateTimeEditorSession = editorSession
-            const $knxServerInput = $('#node-input-server')
-            const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none'])
-            const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map())
-
-            try { RED.sidebar.show('help') } catch (error) { /* ignore */ }
-
-            const resolveKnxServerValue = () => {
-              const domValue = $knxServerInput.val()
-              if (domValue !== undefined && domValue !== null && domValue !== '') return domValue
-              if (node.server !== undefined && node.server !== null && node.server !== '') return node.server
-              return ''
-            }
-
-            const addressFields = ['gaDateTime', 'nameDateTime', 'dptDateTime', 'gaDate', 'nameDate', 'dptDate', 'gaTime', 'nameTime', 'dptTime']
-            const addressSnapshot = () => JSON.stringify(addressFields.map((field) => $('#node-input-' + field).val() || ''))
 
-            const hasKnxServerSelected = () => {
-              const val = resolveKnxServerValue()
-              return !(val === undefined || val === null || KNX_EMPTY_VALUES.has(String(val)))
-            }
+            try {
+              const srv = RED.nodes.node(serverId)
+              if (srv && srv.id) KNX_enableSecureFormatting($gaInput, srv.id)
+            } catch (error) { }
+          }
 
-            const fetchGroupAddresses = (serverId) => {
-              if (!serverId) return Promise.resolve([])
-              if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId))
-              return new Promise((resolve) => {
-                $.getJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
-                  const list = Array.isArray(data) ? data : []
-                  KNX_GA_CACHE.set(serverId, list)
-                  resolve(list)
-                }).fail(() => resolve([]))
-              })
+          $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
+            KNX_GA_CACHE.clear()
+            ensureGaAutocomplete()
+          })
+          ensureGaAutocomplete()
+
+          const syncDivHost = () => {
+            const level = $('#node-input-checkLevel').val() || node.checkLevel || 'Ethernet'
+            if (level === 'Ethernet') {
+              $('#divHost').hide()
+            } else {
+              $('#divHost').show()
             }
+          }
 
-            const setupGA = (gaSelector, nameSelector, dptSelector, allowedPrefixes, defaultDpt) => {
-              const $gaInput = $(gaSelector)
-              const $nameInput = $(nameSelector)
-              const $dptInput = $(dptSelector)
-              if (!$gaInput.length) return
+          $('#node-input-checkLevel').on('change.knxUtilityProfile', function () {
+            syncDivHost()
+          })
+          syncDivHost()
+        },
+        oneditcancel: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
+        },
+        oneditsave: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+        }
 
-              if ($dptInput.length && (!$dptInput.val() || $dptInput.val() === '')) $dptInput.val(defaultDpt)
+      })
+    },
+    "globalcontext": function (RED) {
+      const utilityFieldValue = (node, key) => {
+        if (node._utilityEditor && typeof $ === 'function') {
+          const field = $('#node-input-' + key)
+          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val()
+        }
+        return node[key]
+      }
+      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
+        if (!enabled(this)) return true
+        const numeric = Number(value)
+        return value !== null && value !== undefined && String(value).trim() !== '' &&
+          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric))
+      }
 
-              const sourceFn = (request, response) => {
-                if (!hasKnxServerSelected()) {
-                  response([])
-                  return
-                }
-                const serverId = resolveKnxServerValue()
+      RED.nodes.registerType('knxUltimateGlobalContext', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          name: { value: 'KNXGlobalContext', validate: function (value) { return /^[a-zA-Z]+$/.test(value || '') } },
+          exposeAsVariable: { value: 'exposeAsVariableREADWRITE', required: false },
+          writeExecutionInterval: { value: 1000, validate: utilityNumber(1) },
+          contextStorage: { value: '' }
+        },
+        inputs: 0,
+        outputs: 0,
+        icon: 'node-knx-icon.svg',
+        label: function () {
+          return (this.name)
+        },
+        paletteLabel: 'KNX Global Context',
+        oneditprepare: function () {
+          // Go to the help panel
+          try {
+            RED.sidebar.show('help')
+          } catch (error) { }
+        },
+        oneditsave: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+        },
+        oneditcancel: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+        }
+      })
+    },
+    "logger": function (RED) {
+      const utilityFieldValue = (node, key) => {
+        if (node._utilityEditor && typeof $ === 'function') {
+          const field = $('#node-input-' + key)
+          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val()
+        }
+        return node[key]
+      }
+      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
+        if (!enabled(this)) return true
+        const numeric = Number(value)
+        return value !== null && value !== undefined && String(value).trim() !== '' &&
+          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric))
+      }
+
+      RED.nodes.registerType('knxUltimateLogger', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          topic: { value: '' },
+          intervalCreateETSXML: { value: 15, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'autoStartTimerCreateETSXML') !== false) },
+          name: { value: '' },
+          autoStartTimerCreateETSXML: { value: true },
+          maxRowsInETSXML: { value: 0, validate: utilityNumber(0, true) },
+          saveMode: { value: 'emit' },
+          filePath: { value: '' },
+          autoStartTimerTelegramCounter: { value: false },
+          intervalTelegramCount: { value: 60, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'autoStartTimerTelegramCounter') === true) }
+
+        },
+        inputs: 1,
+        outputs: 2,
+        outputLabels: ['ETS Diag file', 'Telegram Count'],
+        icon: 'node-logger-icon.svg',
+        label: function () {
+          return ((this.name || 'KNX Logger') + ' ' + this.topic)
+        },
+        paletteLabel: 'KNX Logger',
+        oneditprepare: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          const editorSession = { active: true }
+          this._knxUtilityProfileSession = editorSession
+          // Ignore responses belonging to a closed editor or a previous gateway.
+          const profileGetJSON = (url, callback) => {
+            const serverId = $('#node-input-server').val()
+            return $.getJSON(url, (data) => {
+              if (editorSession.active && $('#node-input-server').val() === serverId) callback(data)
+            })
+          }
+          // Go to the help panel
+          try {
+            RED.sidebar.show('help')
+          } catch (error) { }
+
+          $('#mlxETSFileAccordion').accordion({
+            header: 'h3',
+            heightStyle: 'content',
+            collapsible: true,
+            active: false
+          })
+
+          const nodeId = this.id
+          const resolveAdminRoot = () => {
+            const raw = (RED.settings && typeof RED.settings.httpAdminRoot === 'string') ? RED.settings.httpAdminRoot : '/'
+            const trimmed = String(raw || '/').trim()
+            if (trimmed === '' || trimmed === '/') return ''
+            return '/' + trimmed.replace(/^\/+|\/+$/g, '')
+          }
+          const resolveAccessToken = () => {
+            try {
+              const tokens = (RED.settings && typeof RED.settings.get === 'function') ? RED.settings.get('auth-tokens') : null
+              const token = tokens && typeof tokens.access_token === 'string' ? tokens.access_token.trim() : ''
+              return token
+            } catch (error) {
+              return ''
+            }
+          }
+
+          const toggleFilePath = () => {
+            const isEmitSave = $('#node-input-saveMode').val() === 'emit_save'
+            const $filePathRow = $('#knx-logger-filePath-row')
+            if (isEmitSave) {
+              $filePathRow.show()
+            } else {
+              $filePathRow.hide()
+            }
+          }
+          $('#node-input-saveMode').on('change.knxUtilityProfile', toggleFilePath)
+
+          const currentFilePath = this.filePath || ''
+          $('#node-input-filePath').val(currentFilePath)
+          toggleFilePath()
+
+          $('#knx-logger-downloadButton').on('click.knxUtilityProfile', function (evt) {
+            evt.preventDefault()
+            const filePathVal = $('#node-input-filePath').val() || ''
+            if (!filePathVal) {
+              try {
+                const msg = (RED._ && RED._('node-red-contrib-knx-ultimate/knxUltimateLogger:knxUltimateLogger.noFilePath')) || 'File path is empty'
+                RED.notify(msg, 'warning')
+              } catch (error) {
+                alert('File path is empty')
+              }
+              return
+            }
+            const adminRoot = resolveAdminRoot()
+            const targetBase = adminRoot + '/knxUltimateUtility/logger/download'
+            const params = new URLSearchParams()
+            if (nodeId) params.set('nodeId', nodeId)
+            params.set('_', String(Date.now()))
+            const accessToken = resolveAccessToken()
+            if (accessToken) params.set('access_token', accessToken)
+            const target = targetBase + '?' + params.toString()
+            const wnd = window.open(target, '_blank', 'noopener,noreferrer')
+            try { if (wnd && typeof wnd.focus === 'function') wnd.focus() } catch (e) { }
+          })
+        },
+        oneditcancel: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
+        },
+        oneditsave: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+
+          this.filePath = $('#node-input-filePath').val() || ''
+        }
+
+      })
+    },
+    "staircase": function (RED) {
+      const utilityFieldValue = (node, key) => {
+        if (node._utilityEditor && typeof $ === 'function') {
+          const field = $('#node-input-' + key)
+          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val()
+        }
+        return node[key]
+      }
+      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
+        if (!enabled(this)) return true
+        const numeric = Number(value)
+        return value !== null && value !== undefined && String(value).trim() !== '' &&
+          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric))
+      }
+
+      RED.nodes.registerType('knxUltimateStaircase', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          name: { value: '' },
+          outputtopic: { value: '' },
+          gaTrigger: { value: '', required: true },
+          nameTrigger: { value: '' },
+          dptTrigger: { value: '1.001' },
+          gaOutput: { value: '', required: true },
+          nameOutput: { value: '' },
+          dptOutput: { value: '1.001' },
+          gaStatus: { value: '' },
+          nameStatus: { value: '' },
+          dptStatus: { value: '1.001' },
+          gaOverride: { value: '' },
+          nameOverride: { value: '' },
+          dptOverride: { value: '1.001' },
+          gaBlock: { value: '' },
+          nameBlock: { value: '' },
+          dptBlock: { value: '1.001' },
+          timerSeconds: { value: 120, required: true, validate: utilityNumber(1) },
+          extendMode: { value: 'restart' },
+          triggerOffCancels: { value: 'yes' },
+          preWarnEnable: { value: false },
+          preWarnSeconds: { value: 15, validate: utilityNumber(0, false, (node) => utilityFieldValue(node, 'preWarnEnable') === true) },
+          preWarnMode: { value: 'status' },
+          preWarnFlashMs: { value: 400, validate: utilityNumber(100, false, (node) => utilityFieldValue(node, 'preWarnEnable') === true && utilityFieldValue(node, 'preWarnMode') === 'flash') },
+          blockAction: { value: 'off' },
+          emitEvents: { value: false }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: 'node-knx-icon.svg',
+        label: function () {
+          return this.name || 'KNX Staircase'
+        },
+        paletteLabel: 'KNX Staircase',
+        oneditprepare: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          const editorSession = { active: true }
+          this._knxUtilityProfileSession = editorSession
+          // Ignore responses belonging to a closed editor or a previous gateway.
+          const profileGetJSON = (url, callback) => {
+            const serverId = $('#node-input-server').val()
+            return $.getJSON(url, (data) => {
+              if (editorSession.active && $('#node-input-server').val() === serverId) callback(data)
+            })
+          }
+          const node = this
+          const $knxServerInput = $('#node-input-server')
+          try { RED.sidebar.show('help') } catch (error) { /* ignore */ }
+          const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none'])
+
+          const resolveKnxServerValue = () => {
+            const domValue = $knxServerInput.val()
+            if (domValue !== undefined && domValue !== null) return KNX_EMPTY_VALUES.has(String(domValue)) ? '' : domValue
+            if (node.server !== undefined && node.server !== null && node.server !== '') return node.server
+            return ''
+          }
+
+          const hasKnxServerSelected = () => {
+            const val = resolveKnxServerValue()
+            return !(val === undefined || val === null || KNX_EMPTY_VALUES.has(String(val)))
+          }
+
+          const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map())
+
+          const fetchGroupAddresses = (serverId) => {
+            if (!serverId) return Promise.resolve([])
+            if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId))
+            return new Promise((resolve) => {
+              profileGetJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
+                const list = Array.isArray(data) ? data : []
+                KNX_GA_CACHE.set(serverId, list)
+                resolve(list)
+              }).fail(() => resolve([]))
+            })
+          }
+
+          const getGroupAddress = (gaSelector, nameSelector, dptSelector, prefixes) => {
+            const $gaInput = $(gaSelector)
+            const $nameInput = $(nameSelector)
+            const $dptInput = $(dptSelector)
+            if (!$gaInput.length) return
+
+            const ensureAutocomplete = () => {
+              const sourceFn = (request, response) => {
+                if (!hasKnxServerSelected()) {
+                  response([])
+                  return
+                }
+                const serverId = resolveKnxServerValue()
                 fetchGroupAddresses(serverId).then((data) => {
                   if (!editorSession.active || resolveKnxServerValue() !== serverId) return
                   const items = []
                   data.forEach((entry) => {
                     const dpt = entry.dpt || ''
-                    const allowed = allowedPrefixes.some((prefix) => prefix === '' || dpt.startsWith(prefix))
+                    const allowed = prefixes.some((prefix) => prefix === '' || dpt.startsWith(prefix))
                     if (!allowed) return
                     const devName = entry.devicename || ''
                     const searchStr = `${entry.ga} (${devName}) DPT${dpt}`
@@ -709,26 +1303,30 @@
                       let deviceName = ''
                       try {
                         deviceName = ui.item.label.split('#')[1].trim()
+                        deviceName = deviceName.replace(/^\)/, '').trim()
                       } catch (error) { deviceName = '' }
                       if ($nameInput.length) {
-                        $nameInput.val(deviceName || '')
+                        if (deviceName && deviceName !== '') {
+                          $nameInput.val(deviceName)
+                        } else if (!$nameInput.val()) {
+                          $nameInput.val('')
+                        }
                       }
                       try {
                         const parts = ui.item.label.split('#')
                         const dptFromLabel = parts.length >= 3 ? parts[2].trim() : ''
-                        $dptInput.val(dptFromLabel || defaultDpt)
-                      } catch (error) {
-                        $dptInput.val(defaultDpt)
-                      }
+                        if (dptFromLabel !== '') {
+                          $dptInput.val(dptFromLabel)
+                        }
+                      } catch (error) { /* ignore */ }
                     }
                   })
-                  .on('focus.knxUltimateDateTime click.knxUltimateDateTime', function () {
+                  .on('focus.knxUltimateStaircase click.knxUltimateStaircase', function () {
                     const currentValue = $(this).val() || ''
                     try { $(this).autocomplete('search', `${currentValue} exactmatch`) } catch (error) { /* ignore */ }
                   })
                 $gaInput.data('knx-ga-initialised', true)
               }
-
               try {
                 if (hasKnxServerSelected()) {
                   const srv = RED.nodes.node(resolveKnxServerValue())
@@ -737,1599 +1335,960 @@
               } catch (error) { /* ignore */ }
             }
 
-            const refresh = () => {
-              setupGA('#node-input-gaDateTime', '#node-input-nameDateTime', '#node-input-dptDateTime', ['19.'], '19.001')
-              setupGA('#node-input-gaDate', '#node-input-nameDate', '#node-input-dptDate', ['11.'], '11.001')
-              setupGA('#node-input-gaTime', '#node-input-nameTime', '#node-input-dptTime', ['10.'], '10.001')
-            }
-
-            $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
-              KNX_GA_CACHE.clear()
-              refresh()
-              try {
-                const sid = resolveKnxServerValue()
-                if (!sid || sid === '_ADD_') return
-                const hasAnyGAInUi = !!(
-                  ($('#node-input-gaDateTime').val() || '').toString().trim() ||
-                  ($('#node-input-gaDate').val() || '').toString().trim() ||
-                  ($('#node-input-gaTime').val() || '').toString().trim()
-                )
-                // If the current values were auto-filled, allow overwrite when server changes.
-                const shouldOverwrite = node._knxDateTimeAutoConfigured === true && node._knxDateTimeAutoConfiguredServer && node._knxDateTimeAutoConfiguredServer !== sid
-                const beforeRequest = addressSnapshot()
-                // Otherwise fill only empty fields (do not override manual config).
-                knxAutoConfigureDateTimeNodeForServer(node, sid, {
-                  updateDom: true,
-                  overwrite: shouldOverwrite || !hasAnyGAInUi,
-                  canApply: () => editorSession.active && resolveKnxServerValue() === sid && addressSnapshot() === beforeRequest
-                })
-              } catch (error) { /* ignore */ }
-            })
-
-            refresh()
+            ensureAutocomplete()
+          }
 
-            // Auto-select server + fill GAs only for a brand new node (all GAs empty).
-            const initialServer = resolveKnxServerValue()
-            const initialAddresses = addressSnapshot()
-            editorSession.timer = setTimeout(() => {
-              knxAutoConfigureDateTimeNode(node, {
-                updateDom: true,
-                preferExistingServer: true,
-                canApply: () => editorSession.active && resolveKnxServerValue() === initialServer && addressSnapshot() === initialAddresses
-              })
-            }, 50)
+          const BINARY_PREFIX = ['1.']
+          const ANY_ANALOG_PREFIX = ['1.', '2.', '5.', '6.', '7.', '8.', '9.', '12.', '13.', '14.', '16.', '20.']
 
-            const syncUi = () => {
-              const sendOnDeploy = $('#node-input-sendOnDeploy').is(':checked')
-              $('.knx-datetime-deploy-options').toggle(sendOnDeploy)
-              const periodicSend = $('#node-input-periodicSend').is(':checked')
-              $('.knx-datetime-periodic-options').toggle(periodicSend)
+          const refreshKnxBindings = () => {
+            if (!hasKnxServerSelected()) {
+              return
             }
 
-            $('#node-input-sendOnDeploy').on('change.knxUtilityProfile', syncUi)
-            $('#node-input-periodicSend').on('change.knxUtilityProfile', syncUi)
-            syncUi()
-          },
-          oneditcancel: function () {
-            const session = this._knxDateTimeEditorSession
-            if (session) {
-              session.active = false
-              clearTimeout(session.timer)
-            }
-            $('#node-input-server').off('.knxUtilityProfile')
-            $('#node-input-sendOnDeploy').off('.knxUtilityProfile')
-            $('#node-input-periodicSend').off('.knxUtilityProfile')
+            getGroupAddress('#node-input-gaTrigger', '#node-input-nameTrigger', '#node-input-dptTrigger', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaOutput', '#node-input-nameOutput', '#node-input-dptOutput', ANY_ANALOG_PREFIX)
+            getGroupAddress('#node-input-gaStatus', '#node-input-nameStatus', '#node-input-dptStatus', ANY_ANALOG_PREFIX)
+            getGroupAddress('#node-input-gaOverride', '#node-input-nameOverride', '#node-input-dptOverride', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaBlock', '#node-input-nameBlock', '#node-input-dptBlock', BINARY_PREFIX)
           }
-        })
-    },
-    "watchdog": function (RED) {
-      const utilityFieldValue = (node, key) => {
-        if (node._utilityEditor && typeof $ === 'function') {
-          const field = $('#node-input-' + key);
-          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val();
-        }
-        return node[key];
-      };
-      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
-        if (!enabled(this)) return true;
-        const numeric = Number(value);
-        return value !== null && value !== undefined && String(value).trim() !== '' &&
-          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric));
-      };
 
-      RED.nodes.registerType('knxUltimateWatchDog', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: true },
-                  topic: { value: "12/0/0" },
-                  maxRetry: { value: 6, validate: utilityNumber(0, true) }, // Zero reports failure on the first unsuccessful check.
-                  retryInterval: { value: 10, validate: utilityNumber(0.001) },
-                  name: { value: "" },
-                  autoStart: { value: true },
-                  listenToKnxUltimateNodeErrors: { value: true },
-                  checkLevel: { value: "Ethernet" }
-              },
-              inputs: 1,
-              outputs: 1,
-              outputLabels: ["Output"],
-              icon: "node-watchdog-icon.svg",
-              label: function () {
-                  return ((this.name || "KNX Watchdog") + " " + (this.checkLevel == "Ethernet" ? "Gateway IP" : this.topic));
-              },
-              paletteLabel: "KNX WatchDog",
-              oneditprepare: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  const editorSession = { active: true };
-                  this._knxUtilityProfileSession = editorSession;
-                  // Ignore responses belonging to a closed editor or a previous gateway.
-                  const profileGetJSON = (url, callback) => {
-                      const serverId = $('#node-input-server').val();
-                      return $.getJSON(url, (data) => {
-                          if (editorSession.active && $('#node-input-server').val() === serverId) callback(data);
-                      });
-                  };
-                  const node = this;
-                  const $knxServerInput = $("#node-input-server");
-                  const $gaInput = $("#node-input-topic");
-                  const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none']);
-
-                  // Go to the help panel
-                  try {
-                      RED.sidebar.show("help");
-                  } catch (error) { }
-
-                  $("#advancedOptionsAccordion").accordion({
-                      header: "h3",
-                      heightStyle: "content",
-                      collapsible: true,
-                      active: false
-                  });
-
-                  const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map());
-
-                  const resolveKnxServerValue = () => {
-                      const domValue = $knxServerInput.val();
-                      if (domValue !== undefined && domValue !== null) {
-                          return KNX_EMPTY_VALUES.has(String(domValue)) ? '' : domValue;
-                      }
-                      if (node.server !== undefined && node.server !== null && !KNX_EMPTY_VALUES.has(String(node.server))) {
-                          return node.server;
-                      }
-                      return '';
-                  };
-
-                  const fetchGroupAddresses = (serverId) => {
-                      if (!serverId) return Promise.resolve([]);
-                      if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId));
-                      return new Promise((resolve) => {
-                          profileGetJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
-                              const list = Array.isArray(data) ? data : [];
-                              KNX_GA_CACHE.set(serverId, list);
-                              resolve(list);
-                          }).fail(() => resolve([]));
-                      });
-                  };
-
-                  const ensureGaAutocomplete = () => {
-                      const serverId = resolveKnxServerValue();
-                      if (!serverId) {
-                          if ($gaInput.data('ui-autocomplete')) {
-                              $gaInput.autocomplete('disable');
-                          }
-                          return;
-                      }
-
-                      const sourceFn = (request, response) => {
-                          fetchGroupAddresses(serverId).then((data) => {
-                              if (!editorSession.active || resolveKnxServerValue() !== serverId) return;
-                              const items = [];
-                              (data || []).forEach((entry) => {
-                                  const dpt = typeof entry.dpt === 'string' ? entry.dpt : '';
-                                  if (!dpt.startsWith('1.')) return; // Watchdog only accepts boolean GAs
-                                  const devName = entry.devicename || '';
-                                  const searchStr = `${entry.ga} (${devName}) DPT${dpt}`;
-                                  if (!htmlUtilsfullCSVSearch(searchStr, request.term || '')) return;
-                                  items.push({
-                                      label: `${entry.ga} # ${devName} # ${dpt}`,
-                                      value: entry.ga
-                                  });
-                              });
-                              response(items);
-                          });
-                      };
-
-                      if ($gaInput.data('knx-watchdog-ga')) {
-                          $gaInput.autocomplete('option', 'source', sourceFn);
-                          $gaInput.autocomplete('enable');
-                      } else {
-                          $gaInput.autocomplete({
-                              minLength: 0,
-                              source: sourceFn,
-                              select: function (event, ui) {
-                                  event.preventDefault();
-                                  $(this).val(ui.item.value);
-                                  const parts = ui.item.label.split('#');
-                                  let deviceName = (parts[1] || '').trim().replace(/^\)/, '').trim();
-                                  if (deviceName.indexOf('/') > -1) {
-                                      deviceName = deviceName.split('/').pop().trim();
-                                  }
-                                  const $nameInput = $('#node-input-name');
-                                  if (deviceName && $nameInput.length) {
-                                      $nameInput.val(deviceName);
-                                  }
-                              }
-                          }).on('focus.knxUltimateWatchDog click.knxUltimateWatchDog', function () {
-                              const currentValue = $(this).val() || '';
-                              try {
-                                  $(this).autocomplete('search', currentValue ? `${currentValue} exactmatch` : '');
-                              } catch (error) { }
-                          });
-                          $gaInput.data('knx-watchdog-ga', true);
-                      }
-
-                      try {
-                          const srv = RED.nodes.node(serverId);
-                          if (srv && srv.id) KNX_enableSecureFormatting($gaInput, srv.id);
-                      } catch (error) { }
-                  };
-
-                  $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
-                      KNX_GA_CACHE.clear();
-                      ensureGaAutocomplete();
-                  });
-                  ensureGaAutocomplete();
-
-                  const syncDivHost = () => {
-                      const level = $("#node-input-checkLevel").val() || node.checkLevel || "Ethernet";
-                      if (level === "Ethernet") {
-                          $("#divHost").hide();
-                      } else {
-                          $("#divHost").show();
-                      }
-                  };
+          $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
+            KNX_GA_CACHE.clear()
+            refreshKnxBindings()
+          })
 
-                  $("#node-input-checkLevel").on('change.knxUtilityProfile', function () {
-                      syncDivHost();
-                  });
-                  syncDivHost();
-              },
-              oneditcancel: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  $('#node-input-server').off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
-              },
-              oneditsave: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
+          refreshKnxBindings()
 
+          const $preWarnRows = $('.knx-staircase-prewarn')
+          const $flashRow = $('.knx-staircase-prewarn-flash')
 
-              }
+          function syncPreWarnMode () {
+            const enabled = $('#node-input-preWarnEnable').is(':checked')
+            $preWarnRows.toggle(enabled)
+            if (!enabled) {
+              $flashRow.hide()
+              return
+            }
+            const mode = $('#node-input-preWarnMode').val()
+            $flashRow.toggle(mode === 'flash')
+          }
 
-          })
+          $('#node-input-preWarnEnable').on('change.knxUtilityProfile', syncPreWarnMode)
+          $('#node-input-preWarnMode').on('change.knxUtilityProfile', syncPreWarnMode)
+          syncPreWarnMode()
+        },
+        oneditcancel: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
+        }
+      })
     },
-    "globalcontext": function (RED) {
+    "garage": function (RED) {
       const utilityFieldValue = (node, key) => {
         if (node._utilityEditor && typeof $ === 'function') {
-          const field = $('#node-input-' + key);
-          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val();
+          const field = $('#node-input-' + key)
+          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val()
         }
-        return node[key];
-      };
+        return node[key]
+      }
       const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
-        if (!enabled(this)) return true;
-        const numeric = Number(value);
+        if (!enabled(this)) return true
+        const numeric = Number(value)
         return value !== null && value !== undefined && String(value).trim() !== '' &&
-          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric));
-      };
-
-      RED.nodes.registerType('knxUltimateGlobalContext', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: true },
-                  name: { value: "KNXGlobalContext", validate: function (value) { return /^[a-zA-Z]+$/.test(value || ''); } },
-                  exposeAsVariable: { value: "exposeAsVariableREADWRITE", required: false },
-                  writeExecutionInterval: { value: 1000, validate: utilityNumber(1) },
-                  contextStorage: { value: "" }
-              },
-              inputs: 0,
-              outputs: 0,
-              icon: "node-knx-icon.svg",
-              label: function () {
-                  return (this.name);
-              },
-              paletteLabel: "KNX Global Context",
-              oneditprepare: function () {
-                  // Go to the help panel
-                  try {
-                      RED.sidebar.show("help");
-                  } catch (error) { }
-
-
-
-              },
-              oneditsave: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
+          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric))
+      }
 
+      RED.nodes.registerType('knxUltimateGarage', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          name: { value: '' },
+          outputtopic: { value: '' },
+          gaCommand: { value: '', required: true },
+          nameCommand: { value: '' },
+          dptCommand: { value: '1.001' },
+          gaImpulse: { value: '' },
+          nameImpulse: { value: '' },
+          dptImpulse: { value: '1.017' },
+          gaHoldOpen: { value: '' },
+          nameHoldOpen: { value: '' },
+          dptHoldOpen: { value: '1.001' },
+          gaDisable: { value: '' },
+          nameDisable: { value: '' },
+          dptDisable: { value: '1.001' },
+          gaPhotocell: { value: '' },
+          namePhotocell: { value: '' },
+          dptPhotocell: { value: '1.001' },
+          gaMoving: { value: '' },
+          nameMoving: { value: '' },
+          dptMoving: { value: '1.001' },
+          gaObstruction: { value: '' },
+          nameObstruction: { value: '' },
+          dptObstruction: { value: '1.001' },
+          autoCloseEnable: { value: true },
+          autoCloseSeconds: { value: 120, validate: utilityNumber(0, false, (node) => utilityFieldValue(node, 'autoCloseEnable') !== false) },
+          emitEvents: { value: false }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: 'node-knx-icon.svg',
+        label: function () {
+          return this.name || 'KNX Garage'
+        },
+        paletteLabel: 'KNX Garage',
+        oneditprepare: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          const editorSession = { active: true }
+          this._knxUtilityProfileSession = editorSession
+          // Ignore responses belonging to a closed editor or a previous gateway.
+          const profileGetJSON = (url, callback) => {
+            const serverId = $('#node-input-server').val()
+            return $.getJSON(url, (data) => {
+              if (editorSession.active && $('#node-input-server').val() === serverId) callback(data)
+            })
+          }
+          const node = this
+          const $knxServerInput = $('#node-input-server')
+          try { RED.sidebar.show('help') } catch (error) { /* ignore */ }
+          const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none'])
+
+          const resolveKnxServerValue = () => {
+            const domValue = $knxServerInput.val()
+            if (domValue !== undefined && domValue !== null) return KNX_EMPTY_VALUES.has(String(domValue)) ? '' : domValue
+            if (node.server !== undefined && node.server !== null && node.server !== '') return node.server
+            return ''
+          }
 
+          const hasKnxServerSelected = () => {
+            const val = resolveKnxServerValue()
+            return !(val === undefined || val === null || KNX_EMPTY_VALUES.has(String(val)))
+          }
 
-              },
-              oneditcancel: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
+          const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map())
+
+          const fetchGroupAddresses = (serverId) => {
+            if (!serverId) return Promise.resolve([])
+            if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId))
+            return new Promise((resolve) => {
+              profileGetJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
+                const list = Array.isArray(data) ? data : []
+                KNX_GA_CACHE.set(serverId, list)
+                resolve(list)
+              }).fail(() => resolve([]))
+            })
+          }
 
+          const getGroupAddress = (gaSelector, nameSelector, dptSelector, prefixes) => {
+            const $gaInput = $(gaSelector)
+            const $nameInput = $(nameSelector)
+            const $dptInput = $(dptSelector)
+            if (!$gaInput.length) return
 
+            const ensureAutocomplete = () => {
+              const sourceFn = (request, response) => {
+                if (!hasKnxServerSelected()) {
+                  response([])
+                  return
+                }
+                const serverId = resolveKnxServerValue()
+                fetchGroupAddresses(serverId).then((data) => {
+                  if (!editorSession.active || resolveKnxServerValue() !== serverId) return
+                  const items = []
+                  data.forEach((entry) => {
+                    const dpt = entry.dpt || ''
+                    const allowed = prefixes.some((prefix) => prefix === '' || dpt.startsWith(prefix))
+                    if (!allowed) return
+                    const devName = entry.devicename || ''
+                    const searchStr = `${entry.ga} (${devName}) DPT${dpt}`
+                    if (!htmlUtilsfullCSVSearch(searchStr, request.term || '')) return
+                    items.push({
+                      label: `${entry.ga} # ${devName} # ${dpt}`,
+                      value: entry.ga,
+                      dpt
+                    })
+                  })
+                  response(items)
+                })
               }
-          })
-    },
-    "logger": function (RED) {
-      const utilityFieldValue = (node, key) => {
-        if (node._utilityEditor && typeof $ === 'function') {
-          const field = $('#node-input-' + key);
-          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val();
-        }
-        return node[key];
-      };
-      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
-        if (!enabled(this)) return true;
-        const numeric = Number(value);
-        return value !== null && value !== undefined && String(value).trim() !== '' &&
-          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric));
-      };
 
-      RED.nodes.registerType('knxUltimateLogger', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: true },
-                  topic: { value: "" },
-                  intervalCreateETSXML: { value: 15, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'autoStartTimerCreateETSXML') !== false) },
-                  name: { value: "" },
-                  autoStartTimerCreateETSXML: { value: true },
-                  maxRowsInETSXML: { value: 0, validate: utilityNumber(0, true) },
-                  saveMode: { value: "emit" },
-                  filePath: { value: "" },
-                  autoStartTimerTelegramCounter: { value: false },
-                  intervalTelegramCount: { value: 60, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'autoStartTimerTelegramCounter') === true) }
-
-              },
-              inputs: 1,
-              outputs: 2,
-              outputLabels: ["ETS Diag file", "Telegram Count"],
-              icon: "node-logger-icon.svg",
-              label: function () {
-                  return ((this.name || "KNX Logger") + " " + this.topic);
-              },
-              paletteLabel: "KNX Logger",
-              oneditprepare: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  const editorSession = { active: true };
-                  this._knxUtilityProfileSession = editorSession;
-                  // Ignore responses belonging to a closed editor or a previous gateway.
-                  const profileGetJSON = (url, callback) => {
-                      const serverId = $('#node-input-server').val();
-                      return $.getJSON(url, (data) => {
-                          if (editorSession.active && $('#node-input-server').val() === serverId) callback(data);
-                      });
-                  };
-                  // Go to the help panel
-                  try {
-                      RED.sidebar.show("help");
-                  } catch (error) { }
-
-                  $("#mlxETSFileAccordion").accordion({
-                      header: "h3",
-                      heightStyle: "content",
-                      collapsible: true,
-                      active: false
-                  });
-
-                  const nodeId = this.id;
-                  const resolveAdminRoot = () => {
-                      const raw = (RED.settings && typeof RED.settings.httpAdminRoot === "string") ? RED.settings.httpAdminRoot : "/";
-                      const trimmed = String(raw || "/").trim();
-                      if (trimmed === "" || trimmed === "/") return "";
-                      return "/" + trimmed.replace(/^\/+|\/+$/g, "");
-                  };
-                  const resolveAccessToken = () => {
+              if ($gaInput.data('knx-ga-initialised')) {
+                $gaInput.autocomplete('option', 'source', sourceFn)
+              } else {
+                $gaInput
+                  .autocomplete({
+                    minLength: 0,
+                    source: sourceFn,
+                    select: (event, ui) => {
+                      let deviceName = ''
                       try {
-                          const tokens = (RED.settings && typeof RED.settings.get === "function") ? RED.settings.get("auth-tokens") : null;
-                          const token = tokens && typeof tokens.access_token === "string" ? tokens.access_token.trim() : "";
-                          return token;
-                      } catch (error) {
-                          return "";
+                        deviceName = ui.item.label.split('#')[1].trim()
+                        deviceName = deviceName.replace(/^\)/, '').trim()
+                      } catch (error) { deviceName = '' }
+                      if ($nameInput.length) {
+                        if (deviceName && deviceName !== '') {
+                          $nameInput.val(deviceName)
+                        } else if (!$nameInput.val()) {
+                          $nameInput.val('')
+                        }
                       }
-                  };
+                      try {
+                        const parts = ui.item.label.split('#')
+                        const dptFromLabel = parts.length >= 3 ? parts[2].trim() : ''
+                        if (dptFromLabel !== '') {
+                          $dptInput.val(dptFromLabel)
+                        }
+                      } catch (error) { /* ignore */ }
+                    }
+                  })
+                  .on('focus.knxUltimateGarage click.knxUltimateGarage', function () {
+                    const currentValue = $(this).val() || ''
+                    try { $(this).autocomplete('search', `${currentValue} exactmatch`) } catch (error) { /* ignore */ }
+                  })
+                $gaInput.data('knx-ga-initialised', true)
+              }
+              try {
+                if (hasKnxServerSelected()) {
+                  const srv = RED.nodes.node(resolveKnxServerValue())
+                  if (srv && srv.id) KNX_enableSecureFormatting($gaInput, srv.id)
+                }
+              } catch (error) { /* ignore */ }
+            }
 
-                  const toggleFilePath = () => {
-                      const isEmitSave = $("#node-input-saveMode").val() === "emit_save";
-                      const $filePathRow = $("#knx-logger-filePath-row");
-                      if (isEmitSave) {
-                          $filePathRow.show();
-                      } else {
-                          $filePathRow.hide();
-                      }
-                  };
-                  $("#node-input-saveMode").on("change.knxUtilityProfile", toggleFilePath);
-
-                  const currentFilePath = this.filePath || "";
-                  $("#node-input-filePath").val(currentFilePath);
-                  toggleFilePath();
-
-                  $("#knx-logger-downloadButton").on("click.knxUtilityProfile", function (evt) {
-                      evt.preventDefault();
-                      const filePathVal = $("#node-input-filePath").val() || "";
-                      if (!filePathVal) {
-                          try {
-                              const msg = (RED._ && RED._("node-red-contrib-knx-ultimate/knxUltimateLogger:knxUltimateLogger.noFilePath")) || "File path is empty";
-                              RED.notify(msg, "warning");
-                          } catch (error) {
-                              alert("File path is empty");
-                          }
-                          return;
-                      }
-                      const adminRoot = resolveAdminRoot();
-                      const targetBase = adminRoot + "/knxUltimateUtility/logger/download";
-                      const params = new URLSearchParams();
-                      if (nodeId) params.set("nodeId", nodeId);
-                      params.set("_", String(Date.now()));
-                      const accessToken = resolveAccessToken();
-                      if (accessToken) params.set("access_token", accessToken);
-                      const target = targetBase + "?" + params.toString();
-                      const wnd = window.open(target, "_blank", "noopener,noreferrer");
-                      try { if (wnd && typeof wnd.focus === "function") wnd.focus(); } catch (e) { }
-                  });
-              },
-              oneditcancel: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  $('#node-input-server').off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
-              },
-              oneditsave: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
+            ensureAutocomplete()
+          }
 
-                  this.filePath = $("#node-input-filePath").val() || "";
+          const BINARY_PREFIX = ['1.']
 
+          const refreshKnxBindings = () => {
+            if (!hasKnxServerSelected()) return
 
-              }
+            getGroupAddress('#node-input-gaCommand', '#node-input-nameCommand', '#node-input-dptCommand', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaImpulse', '#node-input-nameImpulse', '#node-input-dptImpulse', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaHoldOpen', '#node-input-nameHoldOpen', '#node-input-dptHoldOpen', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaDisable', '#node-input-nameDisable', '#node-input-dptDisable', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaPhotocell', '#node-input-namePhotocell', '#node-input-dptPhotocell', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaMoving', '#node-input-nameMoving', '#node-input-dptMoving', BINARY_PREFIX)
+            getGroupAddress('#node-input-gaObstruction', '#node-input-nameObstruction', '#node-input-dptObstruction', BINARY_PREFIX)
+          }
 
+          $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
+            KNX_GA_CACHE.clear()
+            refreshKnxBindings()
           })
-    },
-    "staircase": function (RED) {
-      const utilityFieldValue = (node, key) => {
-        if (node._utilityEditor && typeof $ === 'function') {
-          const field = $('#node-input-' + key);
-          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val();
+          if (hasKnxServerSelected()) refreshKnxBindings()
+
+          const syncAutoClose = () => {
+            const enabled = $('#node-input-autoCloseEnable').is(':checked')
+            const $seconds = $('#node-input-autoCloseSeconds').closest('.form-row')
+            $seconds.toggle(enabled)
+          }
+
+          $('#node-input-autoCloseEnable').on('change.knxUtilityProfile', syncAutoClose)
+          syncAutoClose()
+        },
+        oneditcancel: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
         }
-        return node[key];
-      };
-      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
-        if (!enabled(this)) return true;
-        const numeric = Number(value);
-        return value !== null && value !== undefined && String(value).trim() !== '' &&
-          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric));
-      };
+      })
+    },
+    "scenecontroller": function (RED) {
+      RED.nodes.registerType('knxUltimateSceneController', {
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: true },
+          name: { value: '' },
+          outputtopic: { value: '' },
+          topic: { value: '' },
+          dpt: { value: '' },
+          topicTrigger: { value: 'true' },
+          topicSave: { value: '' },
+          dptSave: { value: '' },
+          topicSaveTrigger: { value: 'true' },
+
+          rules: { value: [] }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: 'node-scene-icon.svg',
+        label: function () {
+          return (this.outputRBE == true ? '|rbe| ' : '') + (this.name || this.topic || 'KNX Scene Controller') + (this.inputRBE == true ? ' |rbe|' : '')
+        },
+        paletteLabel: 'KNX Scene Controller',
+        oneditprepare: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          const editorSession = { active: true }
+          this._knxUtilityProfileSession = editorSession
+          // Ignore responses belonging to a closed editor or a previous gateway.
+          const profileGetJSON = (url, callback) => {
+            const serverId = $('#node-input-server').val()
+            return $.getJSON(url, (data) => {
+              if (editorSession.active && $('#node-input-server').val() === serverId) callback(data)
+            })
+          }
 
-      RED.nodes.registerType('knxUltimateStaircase', {
-          category: 'KNX Ultimate',
-          color: '#C7E9C0',
-          defaults: {
-            server: { type: 'knxUltimate-config', required: true },
-            name: { value: '' },
-            outputtopic: { value: '' },
-            gaTrigger: { value: '', required: true },
-            nameTrigger: { value: '' },
-            dptTrigger: { value: '1.001' },
-            gaOutput: { value: '', required: true },
-            nameOutput: { value: '' },
-            dptOutput: { value: '1.001' },
-            gaStatus: { value: '' },
-            nameStatus: { value: '' },
-            dptStatus: { value: '1.001' },
-            gaOverride: { value: '' },
-            nameOverride: { value: '' },
-            dptOverride: { value: '1.001' },
-            gaBlock: { value: '' },
-            nameBlock: { value: '' },
-            dptBlock: { value: '1.001' },
-            timerSeconds: { value: 120, required: true, validate: utilityNumber(1) },
-            extendMode: { value: 'restart' },
-            triggerOffCancels: { value: 'yes' },
-            preWarnEnable: { value: false },
-            preWarnSeconds: { value: 15, validate: utilityNumber(0, false, (node) => utilityFieldValue(node, 'preWarnEnable') === true) },
-            preWarnMode: { value: 'status' },
-            preWarnFlashMs: { value: 400, validate: utilityNumber(100, false, (node) => utilityFieldValue(node, 'preWarnEnable') === true && utilityFieldValue(node, 'preWarnMode') === 'flash') },
-            blockAction: { value: 'off' },
-            emitEvents: { value: false }
-          },
-          inputs: 1,
-          outputs: 1,
-          icon: 'node-knx-icon.svg',
-          label: function () {
-            return this.name || 'KNX Staircase';
-          },
-          paletteLabel: 'KNX Staircase',
-          oneditprepare: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  const editorSession = { active: true };
-                  this._knxUtilityProfileSession = editorSession;
-                  // Ignore responses belonging to a closed editor or a previous gateway.
-                  const profileGetJSON = (url, callback) => {
-                      const serverId = $('#node-input-server').val();
-                      return $.getJSON(url, (data) => {
-                          if (editorSession.active && $('#node-input-server').val() === serverId) callback(data);
-                      });
-                  };
-            const node = this;
-            const $knxServerInput = $('#node-input-server');
-            try { RED.sidebar.show('help'); } catch (error) { /* ignore */ }
-            const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none']);
-
-            const resolveKnxServerValue = () => {
-              const domValue = $knxServerInput.val();
-              if (domValue !== undefined && domValue !== null) return KNX_EMPTY_VALUES.has(String(domValue)) ? '' : domValue;
-              if (node.server !== undefined && node.server !== null && node.server !== '') return node.server;
-              return '';
-            };
-
-            const hasKnxServerSelected = () => {
-              const val = resolveKnxServerValue();
-              return !(val === undefined || val === null || KNX_EMPTY_VALUES.has(String(val)));
-            };
-
-            const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map());
-
-            const fetchGroupAddresses = (serverId) => {
-              if (!serverId) return Promise.resolve([]);
-              if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId));
-              return new Promise((resolve) => {
-                profileGetJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
-                  const list = Array.isArray(data) ? data : [];
-                  KNX_GA_CACHE.set(serverId, list);
-                  resolve(list);
-                }).fail(() => resolve([]));
-              });
-            };
-
-            const getGroupAddress = (gaSelector, nameSelector, dptSelector, prefixes) => {
-              const $gaInput = $(gaSelector);
-              const $nameInput = $(nameSelector);
-              const $dptInput = $(dptSelector);
-              if (!$gaInput.length) return;
-
-              const ensureAutocomplete = () => {
-                const sourceFn = (request, response) => {
-                  if (!hasKnxServerSelected()) {
-                    response([]);
-                    return;
-                  }
-                  const serverId = resolveKnxServerValue();
-                  fetchGroupAddresses(serverId).then((data) => {
-                              if (!editorSession.active || resolveKnxServerValue() !== serverId) return;
-                    const items = [];
-                    data.forEach((entry) => {
-                      const dpt = entry.dpt || '';
-                      const allowed = prefixes.some((prefix) => prefix === '' || dpt.startsWith(prefix));
-                      if (!allowed) return;
-                      const devName = entry.devicename || '';
-                      const searchStr = `${entry.ga} (${devName}) DPT${dpt}`;
-                      if (!htmlUtilsfullCSVSearch(searchStr, request.term || '')) return;
-                      items.push({
-                        label: `${entry.ga} # ${devName} # ${dpt}`,
-                        value: entry.ga,
-                        ga: entry.ga
-                      });
-                    });
-                    response(items);
-                  });
-                };
-
-                if ($gaInput.data('knx-ga-initialised')) {
-                  $gaInput.autocomplete('option', 'source', sourceFn);
-                } else {
-                  $gaInput
-                    .autocomplete({
-                      minLength: 0,
-                      source: sourceFn,
-                      select: (event, ui) => {
-                        let deviceName = '';
-                        try {
-                          deviceName = ui.item.label.split('#')[1].trim();
-                          deviceName = deviceName.replace(/^\)/, '').trim();
-                        } catch (error) { deviceName = ''; }
-                        if ($nameInput.length) {
-                          if (deviceName && deviceName !== '') {
-                            $nameInput.val(deviceName);
-                          } else if (!$nameInput.val()) {
-                            $nameInput.val('');
-                          }
-                        }
-                        try {
-                          const parts = ui.item.label.split('#');
-                          const dptFromLabel = parts.length >= 3 ? parts[2].trim() : '';
-                          if (dptFromLabel !== '') {
-                            $dptInput.val(dptFromLabel);
-                          }
-                        } catch (error) { /* ignore */ }
-                      }
-                    })
-                    .on('focus.knxUltimateStaircase click.knxUltimateStaircase', function () {
-                      const currentValue = $(this).val() || '';
-                      try { $(this).autocomplete('search', `${currentValue} exactmatch`); } catch (error) { /* ignore */ }
-                    });
-                  $gaInput.data('knx-ga-initialised', true);
-                }
-                try {
-                  if (hasKnxServerSelected()) {
-                    const srv = RED.nodes.node(resolveKnxServerValue());
-                    if (srv && srv.id) KNX_enableSecureFormatting($gaInput, srv.id);
-                  }
-                } catch (error) { /* ignore */ }
-              };
+          const dptFields = []
+          const dptRequests = new Map()
+          const loadDptOptions = (field, savedValue, track = true) => {
+            if (track) {
+              dptFields.push(field)
+              // Preserve persisted values even when Done is pressed before
+              // the asynchronous DPT catalog has arrived.
+              field.append($('<option></option>').attr('value', savedValue || '').text(savedValue || ''))
+              field.val(savedValue || '')
+            }
+            const serverId = $('#node-input-server').val()
+            if (!dptRequests.has(serverId)) {
+              dptRequests.set(serverId, new Promise((resolve) => {
+                profileGetJSON('knxUltimateDpts?serverId=' + encodeURIComponent(serverId || ''), resolve)
+              }))
+            }
+            dptRequests.get(serverId).then((data) => {
+              if (!editorSession.active || $('#node-input-server').val() !== serverId) return
+              const selected = field.val()
+              field.empty().append($('<option></option>').attr('value', '').text(''))
+              const rows = Array.isArray(data) ? data : []
+              rows.forEach((dpt) => field.append($('<option></option>').attr('value', dpt.value).text(dpt.text)))
+              if (selected && !rows.some((dpt) => String(dpt.value) === String(selected))) {
+                field.append($('<option></option>').attr('value', selected).text(selected))
+              }
+              field.val(selected || '')
+            })
+          }
+          // Go to the help panel
+          try {
+            RED.sidebar.show('help')
+          } catch (error) { }
 
-              ensureAutocomplete();
-            };
+          const node = this
+          let oNodeServer = RED.nodes.node($('#node-input-server').val()) // Store the config-node
 
-            const BINARY_PREFIX = ['1.'];
-            const ANY_ANALOG_PREFIX = ['1.', '2.', '5.', '6.', '7.', '8.', '9.', '12.', '13.', '14.', '16.', '20.'];
+          // 19/02/2020 Used to get the server sooner als deploy.
+          $('#node-input-server').off('.knxUtilityProfile').on('change.knxUtilityProfile', function () {
+            try {
+              oNodeServer = RED.nodes.node($(this).val())
+              dptFields.forEach((field) => loadDptOptions(field, field.val(), false))
+            } catch (error) { }
+          })
 
-            const refreshKnxBindings = () => {
-              if (!hasKnxServerSelected()) {
-                return;
+          // DPT of Scene Recall
+          // ########################
+          loadDptOptions($('#node-input-dpt'), this.dpt)
+
+          // Autocomplete suggestion with ETS csv File
+          $('#node-input-topic').autocomplete({
+            minLength: 0,
+            source: function (request, response) {
+              // profileGetJSON("csv", request, function( data, status, xhr ) {
+              if (!oNodeServer || !oNodeServer.id) { response([]); return }
+              profileGetJSON('knxUltimatecsv?nodeID=' + oNodeServer.id, (data) => {
+                response($.map(data, function (value, key) {
+                  const sSearch = (value.ga + ' (' + value.devicename + ') DPT' + value.dpt)
+                  if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
+                    return {
+                      label: value.ga + ' # ' + value.devicename + ' # ' + value.dpt, // Label for Display
+                      value: value.ga // Value
+                    }
+                  } else {
+                    return null
+                  }
+                }))
+              })
+            },
+            select: function (event, ui) {
+              // Sets Datapoint and device name automatically
+              let sDevName = ui.item.label.split('#')[1].trim()
+              try {
+                sDevName = sDevName.substr(sDevName.indexOf(')') + 1).trim()
+              } catch (error) {
               }
-
-              getGroupAddress('#node-input-gaTrigger', '#node-input-nameTrigger', '#node-input-dptTrigger', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaOutput', '#node-input-nameOutput', '#node-input-dptOutput', ANY_ANALOG_PREFIX);
-              getGroupAddress('#node-input-gaStatus', '#node-input-nameStatus', '#node-input-dptStatus', ANY_ANALOG_PREFIX);
-              getGroupAddress('#node-input-gaOverride', '#node-input-nameOverride', '#node-input-dptOverride', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaBlock', '#node-input-nameBlock', '#node-input-dptBlock', BINARY_PREFIX);
-            };
-
-            $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
-              KNX_GA_CACHE.clear();
-              refreshKnxBindings();
-            });
-
-            refreshKnxBindings();
-
-            const $preWarnRows = $('.knx-staircase-prewarn');
-            const $flashRow = $('.knx-staircase-prewarn-flash');
-
-            function syncPreWarnMode() {
-              const enabled = $('#node-input-preWarnEnable').is(':checked');
-              $preWarnRows.toggle(enabled);
-              if (!enabled) {
-                $flashRow.hide();
-                return;
+              $('#node-input-name').val('Recall: ' + sDevName + '/' + $('#node-input-name').val().split('/')[1])
+              const optVal = $("#node-input-dpt option:contains('" + ui.item.label.split('#')[2].trim() + "')").attr('value')
+              const $dptSelect = $('#node-input-dpt')
+              if (optVal !== undefined && optVal !== null) {
+                $dptSelect.val(optVal).trigger('change')
+              } else {
+                $dptSelect.trigger('change')
               }
-              const mode = $('#node-input-preWarnMode').val();
-              $flashRow.toggle(mode === 'flash');
             }
-
-            $('#node-input-preWarnEnable').on('change.knxUtilityProfile', syncPreWarnMode);
-            $('#node-input-preWarnMode').on('change.knxUtilityProfile', syncPreWarnMode);
-            syncPreWarnMode();
-          },
-              oneditcancel: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  $('#node-input-server').off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
+          }).focus(function () {
+            $(this).autocomplete('search', $(this).val() + 'exactmatch')
+          })
+          try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting($('#node-input-topicSave'), oNodeServer.id) } catch (e) {}
+          try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting($('#node-input-topic'), oNodeServer.id) } catch (e) {}
+
+          // 19/03/2020 Adjust trigger value accordingly
+          $('#node-input-dpt').on('change.knxUtilityProfile', function () {
+            if ($(this).val() !== null) {
+              if ($(this).val().indexOf('3.007') > -1) {
+                // It's a DIM. Suggest the right value
+                $('#node-input-topicTrigger').val('{decr_incr:1, data:5}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT3007'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
+                        }
+                      }]
+                  })
+              } else if ($(this).val().indexOf('18.001') > -1) {
+                // It's a scene actuator. Suggest the right value
+                $('#node-input-topicTrigger').val('{save_recall:0, scenenumber:2}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT18001'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
+                        }
+                      }]
+                  })
+              } else if ($(this).val().indexOf('232.600') > -1) {
+                // It's a scene actuator. Suggest the right value
+                $('#node-input-topicTrigger').val('{red:0, green:0, blue:0}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT232600'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
+                        }
+                      }]
+                  })
+              } else if ($(this).val().indexOf('251.600') > -1) {
+                // It's a scene actuator. Suggest the right value
+                $('#node-input-topicTrigger').val('{red:0, green:0, blue:0, white:0, mR:1, mG:1, mB:1, mW:1}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT251600'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
+                        }
+                      }]
+                  })
               }
-        });
-    },
-    "garage": function (RED) {
-      const utilityFieldValue = (node, key) => {
-        if (node._utilityEditor && typeof $ === 'function') {
-          const field = $('#node-input-' + key);
-          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val();
-        }
-        return node[key];
-      };
-      const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
-        if (!enabled(this)) return true;
-        const numeric = Number(value);
-        return value !== null && value !== undefined && String(value).trim() !== '' &&
-          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric));
-      };
-
-      RED.nodes.registerType('knxUltimateGarage', {
-          category: 'KNX Ultimate',
-          color: '#C7E9C0',
-          defaults: {
-            server: { type: 'knxUltimate-config', required: true },
-            name: { value: '' },
-            outputtopic: { value: '' },
-            gaCommand: { value: '', required: true },
-            nameCommand: { value: '' },
-            dptCommand: { value: '1.001' },
-            gaImpulse: { value: '' },
-            nameImpulse: { value: '' },
-            dptImpulse: { value: '1.017' },
-            gaHoldOpen: { value: '' },
-            nameHoldOpen: { value: '' },
-            dptHoldOpen: { value: '1.001' },
-            gaDisable: { value: '' },
-            nameDisable: { value: '' },
-            dptDisable: { value: '1.001' },
-            gaPhotocell: { value: '' },
-            namePhotocell: { value: '' },
-            dptPhotocell: { value: '1.001' },
-            gaMoving: { value: '' },
-            nameMoving: { value: '' },
-            dptMoving: { value: '1.001' },
-            gaObstruction: { value: '' },
-            nameObstruction: { value: '' },
-            dptObstruction: { value: '1.001' },
-            autoCloseEnable: { value: true },
-            autoCloseSeconds: { value: 120, validate: utilityNumber(0, false, (node) => utilityFieldValue(node, 'autoCloseEnable') !== false) },
-            emitEvents: { value: false }
-          },
-          inputs: 1,
-          outputs: 1,
-          icon: 'node-knx-icon.svg',
-          label: function () {
-            return this.name || 'KNX Garage';
-          },
-          paletteLabel: 'KNX Garage',
-          oneditprepare: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  const editorSession = { active: true };
-                  this._knxUtilityProfileSession = editorSession;
-                  // Ignore responses belonging to a closed editor or a previous gateway.
-                  const profileGetJSON = (url, callback) => {
-                      const serverId = $('#node-input-server').val();
-                      return $.getJSON(url, (data) => {
-                          if (editorSession.active && $('#node-input-server').val() === serverId) callback(data);
-                      });
-                  };
-            const node = this;
-            const $knxServerInput = $('#node-input-server');
-            try { RED.sidebar.show('help'); } catch (error) { /* ignore */ }
-            const KNX_EMPTY_VALUES = new Set(['', '_ADD_', '__NONE__', 'none']);
-
-            const resolveKnxServerValue = () => {
-              const domValue = $knxServerInput.val();
-              if (domValue !== undefined && domValue !== null) return KNX_EMPTY_VALUES.has(String(domValue)) ? '' : domValue;
-              if (node.server !== undefined && node.server !== null && node.server !== '') return node.server;
-              return '';
-            };
-
-            const hasKnxServerSelected = () => {
-              const val = resolveKnxServerValue();
-              return !(val === undefined || val === null || KNX_EMPTY_VALUES.has(String(val)));
-            };
-
-            const KNX_GA_CACHE = node._knxGaCache || (node._knxGaCache = new Map());
-
-            const fetchGroupAddresses = (serverId) => {
-              if (!serverId) return Promise.resolve([]);
-              if (KNX_GA_CACHE.has(serverId)) return Promise.resolve(KNX_GA_CACHE.get(serverId));
-              return new Promise((resolve) => {
-                profileGetJSON(`knxUltimatecsv?nodeID=${serverId}&_=${Date.now()}`, (data) => {
-                  const list = Array.isArray(data) ? data : [];
-                  KNX_GA_CACHE.set(serverId, list);
-                  resolve(list);
-                }).fail(() => resolve([]));
-              });
-            };
-
-            const getGroupAddress = (gaSelector, nameSelector, dptSelector, prefixes) => {
-              const $gaInput = $(gaSelector);
-              const $nameInput = $(nameSelector);
-              const $dptInput = $(dptSelector);
-              if (!$gaInput.length) return;
-
-              const ensureAutocomplete = () => {
-                const sourceFn = (request, response) => {
-                  if (!hasKnxServerSelected()) {
-                    response([]);
-                    return;
+            }
+          })
+          // ########################
+
+          // DPT of Scene Save
+          // ########################
+          loadDptOptions($('#node-input-dptSave'), this.dptSave)
+
+          // Autocomplete suggestion with ETS csv File
+          $('#node-input-topicSave').autocomplete({
+            minLength: 0,
+            source: function (request, response) {
+              if (!oNodeServer || !oNodeServer.id) { response([]); return }
+              profileGetJSON('knxUltimatecsv?nodeID=' + oNodeServer.id, (data) => {
+                response($.map(data, function (value, key) {
+                  const sSearch = (value.ga + ' (' + value.devicename + ') DPT' + value.dpt)
+                  if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
+                    return {
+                      label: value.ga + ' # ' + value.devicename + ' # ' + value.dpt, // Label for Display
+                      value: value.ga // Value
+                    }
+                  } else {
+                    return null
                   }
-                  const serverId = resolveKnxServerValue();
-                  fetchGroupAddresses(serverId).then((data) => {
-                              if (!editorSession.active || resolveKnxServerValue() !== serverId) return;
-                    const items = [];
-                    data.forEach((entry) => {
-                      const dpt = entry.dpt || '';
-                      const allowed = prefixes.some((prefix) => prefix === '' || dpt.startsWith(prefix));
-                      if (!allowed) return;
-                      const devName = entry.devicename || '';
-                      const searchStr = `${entry.ga} (${devName}) DPT${dpt}`;
-                      if (!htmlUtilsfullCSVSearch(searchStr, request.term || '')) return;
-                      items.push({
-                        label: `${entry.ga} # ${devName} # ${dpt}`,
-                        value: entry.ga,
-                        dpt
-                      });
-                    });
-                    response(items);
-                  });
-                };
-
-                if ($gaInput.data('knx-ga-initialised')) {
-                  $gaInput.autocomplete('option', 'source', sourceFn);
-                } else {
-                  $gaInput
-                    .autocomplete({
-                      minLength: 0,
-                      source: sourceFn,
-                      select: (event, ui) => {
-                        let deviceName = '';
-                        try {
-                          deviceName = ui.item.label.split('#')[1].trim();
-                          deviceName = deviceName.replace(/^\)/, '').trim();
-                        } catch (error) { deviceName = ''; }
-                        if ($nameInput.length) {
-                          if (deviceName && deviceName !== '') {
-                            $nameInput.val(deviceName);
-                          } else if (!$nameInput.val()) {
-                            $nameInput.val('');
-                          }
+                }))
+              })
+            },
+            select: function (event, ui) {
+              // Sets Datapoint and device name automatically
+              let sDevName = ui.item.label.split('#')[1].trim()
+              try {
+                sDevName = sDevName.substr(sDevName.indexOf(')') + 1).trim()
+              } catch (error) {
+              }
+              $('#node-input-name').val($('#node-input-name').val().split('/')[0] + '/Save: ' + sDevName)
+              const optVal = $("#node-input-dptSave option:contains('" + ui.item.label.split('#')[2].trim() + "')").attr('value')
+              const $dptSelect = $('#node-input-dptSave')
+              if (optVal !== undefined && optVal !== null) {
+                $dptSelect.val(optVal).trigger('change')
+              } else {
+                $dptSelect.trigger('change')
+              }
+            }
+          }).focus(function () {
+            $(this).autocomplete('search', $(this).val() + 'exactmatch')
+          })
+
+          // 02/04/2020 Adjust trigger value accordingly
+          $('#node-input-dptSave').on('change.knxUtilityProfile', function () {
+            if ($(this).val() !== null) {
+              if ($(this).val().indexOf('3.007') > -1) {
+                // It's a DIM. Suggest the right value
+                $('#node-input-topicSaveTrigger').val('{decr_incr:1, data:5}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT3007'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
                         }
-                        try {
-                          const parts = ui.item.label.split('#');
-                          const dptFromLabel = parts.length >= 3 ? parts[2].trim() : '';
-                          if (dptFromLabel !== '') {
-                            $dptInput.val(dptFromLabel);
-                          }
-                        } catch (error) { /* ignore */ }
-                      }
-                    })
-                    .on('focus.knxUltimateGarage click.knxUltimateGarage', function () {
-                      const currentValue = $(this).val() || '';
-                      try { $(this).autocomplete('search', `${currentValue} exactmatch`); } catch (error) { /* ignore */ }
-                    });
-                  $gaInput.data('knx-ga-initialised', true);
-                }
-                try {
-                  if (hasKnxServerSelected()) {
-                    const srv = RED.nodes.node(resolveKnxServerValue());
-                    if (srv && srv.id) KNX_enableSecureFormatting($gaInput, srv.id);
-                  }
-                } catch (error) { /* ignore */ }
-              };
-
-              ensureAutocomplete();
-            };
-
-            const BINARY_PREFIX = ['1.'];
-
-            const refreshKnxBindings = () => {
-              if (!hasKnxServerSelected()) return;
-
-              getGroupAddress('#node-input-gaCommand', '#node-input-nameCommand', '#node-input-dptCommand', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaImpulse', '#node-input-nameImpulse', '#node-input-dptImpulse', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaHoldOpen', '#node-input-nameHoldOpen', '#node-input-dptHoldOpen', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaDisable', '#node-input-nameDisable', '#node-input-dptDisable', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaPhotocell', '#node-input-namePhotocell', '#node-input-dptPhotocell', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaMoving', '#node-input-nameMoving', '#node-input-dptMoving', BINARY_PREFIX);
-              getGroupAddress('#node-input-gaObstruction', '#node-input-nameObstruction', '#node-input-dptObstruction', BINARY_PREFIX);
-            };
-
-            $knxServerInput.off('.knxUtilityProfile').on('change.knxUtilityProfile', () => {
-              KNX_GA_CACHE.clear();
-              refreshKnxBindings();
-            });
-            if (hasKnxServerSelected()) refreshKnxBindings();
-
-            const syncAutoClose = () => {
-              const enabled = $('#node-input-autoCloseEnable').is(':checked');
-              const $seconds = $('#node-input-autoCloseSeconds').closest('.form-row');
-              $seconds.toggle(enabled);
-            };
-
-            $('#node-input-autoCloseEnable').on('change.knxUtilityProfile', syncAutoClose);
-            syncAutoClose();
-          },
-              oneditcancel: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  $('#node-input-server').off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
+                      }]
+                  })
+              } else if ($(this).val().indexOf('18.001') > -1) {
+                // It's a scene actuator. Suggest the right value
+                $('#node-input-topicSaveTrigger').val('{save_recall:1, scenenumber:2}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT18001'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
+                        }
+                      }]
+                  })
+              } else if ($(this).val().indexOf('232.600') > -1) {
+                // It's a scene actuator. Suggest the right value
+                $('#node-input-topicSaveTrigger').val('{red:0, green:0, blue:0}')
+                var myNotification = RED.notify(node._('knxUltimateSceneController.advanced.notify-DPT232600'),
+                  {
+                    modal: true,
+                    fixed: true,
+                    type: 'info',
+                    buttons: [
+                      {
+                        text: 'OK',
+                        click: function (e) {
+                          myNotification.close()
+                        }
+                      }]
+                  })
               }
-        });
-    },
-    "scenecontroller": function (RED) {
-      RED.nodes.registerType('knxUltimateSceneController', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: true },
-                  name: { value: "" },
-                  outputtopic: { value: "" },
-                  topic: { value: "" },
-                  dpt: { value: "" },
-                  topicTrigger: { value: "true" },
-                  topicSave: { value: "" },
-                  dptSave: { value: "" },
-                  topicSaveTrigger: { value: "true" },
-
-                  rules: { value: [] }
-              },
-              inputs: 1,
-              outputs: 1,
-              icon: "node-scene-icon.svg",
-              label: function () {
-                  return (this.outputRBE == true ? "|rbe| " : "") + (this.name || this.topic || "KNX Scene Controller") + (this.inputRBE == true ? " |rbe|" : "")
-              },
-              paletteLabel: "KNX Scene Controller",
-              oneditprepare: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  const editorSession = { active: true };
-                  this._knxUtilityProfileSession = editorSession;
-                  // Ignore responses belonging to a closed editor or a previous gateway.
-                  const profileGetJSON = (url, callback) => {
-                      const serverId = $('#node-input-server').val();
-                      return $.getJSON(url, (data) => {
-                          if (editorSession.active && $('#node-input-server').val() === serverId) callback(data);
-                      });
-                  };
-
-                  const dptFields = [];
-                  const dptRequests = new Map();
-                  const loadDptOptions = (field, savedValue, track = true) => {
-                      if (track) {
-                          dptFields.push(field);
-                          // Preserve persisted values even when Done is pressed before
-                          // the asynchronous DPT catalog has arrived.
-                          field.append($('<option></option>').attr('value', savedValue || '').text(savedValue || ''));
-                          field.val(savedValue || '');
-                      }
-                      const serverId = $('#node-input-server').val();
-                      if (!dptRequests.has(serverId)) {
-                          dptRequests.set(serverId, new Promise((resolve) => {
-                              profileGetJSON('knxUltimateDpts?serverId=' + encodeURIComponent(serverId || ''), resolve);
-                          }));
-                      }
-                      dptRequests.get(serverId).then((data) => {
-                          if (!editorSession.active || $('#node-input-server').val() !== serverId) return;
-                          const selected = field.val();
-                          field.empty().append($('<option></option>').attr('value', '').text(''));
-                          const rows = Array.isArray(data) ? data : [];
-                          rows.forEach((dpt) => field.append($('<option></option>').attr('value', dpt.value).text(dpt.text)));
-                          if (selected && !rows.some((dpt) => String(dpt.value) === String(selected))) {
-                              field.append($('<option></option>').attr('value', selected).text(selected));
-                          }
-                          field.val(selected || '');
-                      });
-                  };
-                  // Go to the help panel
-                  try {
-                      RED.sidebar.show("help");
-                  } catch (error) { }
+            }
+          })
+          // ########################
 
-                  var node = this;
-                  var oNodeServer = RED.nodes.node($("#node-input-server").val()); // Store the config-node
+          // Scene configuration
+          function resizeRule (rule) { }
+          $('#node-input-rule-container').css('min-height', '150px').css('min-width', '450px').editableList({
+            addItem: function (container, i, opt) { // row, index, data
+              // opt.r is: { topic: rowRuleTopic, devicename: rowRuleDeviceName, dpt:rowRuleDPT, send: rowRuleSend}
 
-                  // 19/02/2020 Used to get the server sooner als deploy.
-                  $("#node-input-server").off(".knxUtilityProfile").on("change.knxUtilityProfile", function () {
-                      try {
-                          oNodeServer = RED.nodes.node($(this).val());
-                          dptFields.forEach((field) => loadDptOptions(field, field.val(), false));
-                      } catch (error) { }
-                  });
-
-
-
-                  // DPT of Scene Recall
-                  // ########################
-                  loadDptOptions($("#node-input-dpt"), this.dpt);
-
-                  // Autocomplete suggestion with ETS csv File
-                  $("#node-input-topic").autocomplete({
-                      minLength: 0,
-                      source: function (request, response) {
-                          //profileGetJSON("csv", request, function( data, status, xhr ) {
-                          if (!oNodeServer || !oNodeServer.id) { response([]); return; }
-                          profileGetJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
-                              response($.map(data, function (value, key) {
-                                  var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                                  if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
-                                      return {
-                                          label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
-                                          value: value.ga // Value
-                                      }
-                                  } else {
-                                      return null;
-                                  }
-                              }));
-                          });
-                      }, select: function (event, ui) {
-                          // Sets Datapoint and device name automatically
-                          var sDevName = ui.item.label.split("#")[1].trim();
-                          try {
-                              sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
-                          } catch (error) {
-                          }
-                          $('#node-input-name').val("Recall: " + sDevName + "/" + $('#node-input-name').val().split("/")[1]);
-                          var optVal = $("#node-input-dpt option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
-                          var $dptSelect = $("#node-input-dpt");
-                          if (optVal !== undefined && optVal !== null) {
-                              $dptSelect.val(optVal).trigger('change');
-                          } else {
-                              $dptSelect.trigger('change');
-                          }
-                      }
-                  }).focus(function () {
-                      $(this).autocomplete('search', $(this).val() + 'exactmatch');
-                  });
-                  try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting($("#node-input-topicSave"), oNodeServer.id); } catch (e) {}
-                  try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting($("#node-input-topic"), oNodeServer.id); } catch (e) {}
-
-                  // 19/03/2020 Adjust trigger value accordingly
-                  $("#node-input-dpt").on("change.knxUtilityProfile", function () {
-                      if ($(this).val() !== null) {
-                          if ($(this).val().indexOf("3.007") > -1) {
-                              // It's a DIM. Suggest the right value
-                              $("#node-input-topicTrigger").val("{decr_incr:1, data:5}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT3007"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
-                          } else if ($(this).val().indexOf("18.001") > -1) {
-                              // It's a scene actuator. Suggest the right value
-                              $("#node-input-topicTrigger").val("{save_recall:0, scenenumber:2}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT18001"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
-
-                          } else if ($(this).val().indexOf("232.600") > -1) {
-                              // It's a scene actuator. Suggest the right value
-                              $("#node-input-topicTrigger").val("{red:0, green:0, blue:0}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT232600"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
-
-                          } else if ($(this).val().indexOf("251.600") > -1) {
-                              // It's a scene actuator. Suggest the right value
-                              $("#node-input-topicTrigger").val("{red:0, green:0, blue:0, white:0, mR:1, mG:1, mB:1, mW:1}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT251600"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
+              if (!opt.hasOwnProperty('r')) {
+                opt.r = {}
+              }
+              const rule = opt.r
+              if (!opt.hasOwnProperty('i')) {
+                opt._i = Math.floor((0x99999 - 0x10000) * Math.random()).toString()
+              }
+              container.css({
+                overflow: 'hidden',
+                whiteSpace: 'nowrap'
+              })
 
-                          }
+              const row = $('<div class="form-row"/>').appendTo(container)
+              const row2 = $('<div class="form-row"/>', { style: 'padding-top: 5px; padding-left: 5px;' }).appendTo(container)
 
-                      }
-                  });
-                  // ########################
-
-
-
-                  // DPT of Scene Save
-                  // ########################
-                  loadDptOptions($("#node-input-dptSave"), this.dptSave);
-
-                  // Autocomplete suggestion with ETS csv File
-                  $("#node-input-topicSave").autocomplete({
-                      minLength: 0,
-                      source: function (request, response) {
-                          if (!oNodeServer || !oNodeServer.id) { response([]); return; }
-                          profileGetJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
-                              response($.map(data, function (value, key) {
-                                  var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                                  if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
-                                      return {
-                                          label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
-                                          value: value.ga // Value
-                                      }
-                                  } else {
-                                      return null;
-                                  }
-                              }));
-                          });
-                      }, select: function (event, ui) {
-                          // Sets Datapoint and device name automatically
-                          var sDevName = ui.item.label.split("#")[1].trim();
-                          try {
-                              sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
-                          } catch (error) {
-                          }
-                          $('#node-input-name').val($('#node-input-name').val().split("/")[0] + "/Save: " + sDevName);
-                          var optVal = $("#node-input-dptSave option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
-                          var $dptSelect = $("#node-input-dptSave");
-                          if (optVal !== undefined && optVal !== null) {
-                              $dptSelect.val(optVal).trigger('change');
-                          } else {
-                              $dptSelect.trigger('change');
-                          }
-                      }
-                  }).focus(function () {
-                      $(this).autocomplete('search', $(this).val() + 'exactmatch');
-                  });
-
-                  // 02/04/2020 Adjust trigger value accordingly
-                  $("#node-input-dptSave").on("change.knxUtilityProfile", function () {
-                      if ($(this).val() !== null) {
-                          if ($(this).val().indexOf("3.007") > -1) {
-                              // It's a DIM. Suggest the right value
-                              $("#node-input-topicSaveTrigger").val("{decr_incr:1, data:5}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT3007"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
-                          } else if ($(this).val().indexOf("18.001") > -1) {
-                              // It's a scene actuator. Suggest the right value
-                              $("#node-input-topicSaveTrigger").val("{save_recall:1, scenenumber:2}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT18001"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
-
-                          } else if ($(this).val().indexOf("232.600") > -1) {
-                              // It's a scene actuator. Suggest the right value
-                              $("#node-input-topicSaveTrigger").val("{red:0, green:0, blue:0}");
-                              var myNotification = RED.notify(node._("knxUltimateSceneController.advanced.notify-DPT232600"),
-                                  {
-                                      modal: true,
-                                      fixed: true,
-                                      type: 'info',
-                                      buttons: [
-                                          {
-                                              text: "OK",
-                                              click: function (e) {
-                                                  myNotification.close();
-                                              }
-                                          }]
-                                  })
+              const oTopicField = $('<input/>', { class: 'rowRuleTopic', type: 'text', placeholder: '1/1/1, wait or device name', style: 'width:140px; margin-left: 5px; text-align: left;' }).appendTo(row)
+              const oDPTField = $('<select/>', { class: 'rowRuleDPT', type: 'text', style: 'width:160px; margin-left: 5px; text-align: left;' }).appendTo(row)
+              const finalspan = $('<span/>', { style: '' }).appendTo(row)
+              finalspan.append(' &#8594; <span class="node-input-rule-index"></span> ')
+              const oSendField = $('<input/>', { class: 'rowRuleSend', type: 'text', placeholder: 'Value', style: 'width:150px; margin-left: 5px; text-align: left;' }).appendTo(row)
+              const orowRuleDeviceName = $('<input/>', { class: 'rowRuleDeviceName', type: 'text', style: 'width:95%; margin-left: 0px; text-align: left;font-style: italic;', placeholder: 'Device Name' }).appendTo(row2)
 
-                          }
+              oTopicField.on('change.knxUtilityProfile', function () {
+                resizeRule(container)
+              })
 
+              loadDptOptions(oDPTField, rule.dpt)
+
+              // Autocomplete suggestion with ETS csv File
+              oTopicField.autocomplete({
+                minLength: 0,
+                source: function (request, response) {
+                  if (!oNodeServer || !oNodeServer.id) { response([]); return }
+                  profileGetJSON('knxUltimatecsv?nodeID=' + oNodeServer.id, (data) => {
+                    response($.map(data, function (value, key) {
+                      const sSearch = (value.ga + ' (' + value.devicename + ') DPT' + value.dpt)
+                      if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
+                        return {
+                          label: value.ga + ' # ' + value.devicename + ' # ' + value.dpt, // Label for Display
+                          value: value.ga // Value
+                        }
+                      } else {
+                        return null
                       }
-                  });
-                  // ########################
-
-
-                  // Scene configuration
-                  function resizeRule(rule) { }
-                  $("#node-input-rule-container").css('min-height', '150px').css('min-width', '450px').editableList({
-                      addItem: function (container, i, opt) { // row, index, data
-                          // opt.r is: { topic: rowRuleTopic, devicename: rowRuleDeviceName, dpt:rowRuleDPT, send: rowRuleSend}
-
-                          if (!opt.hasOwnProperty('r')) {
-                              opt.r = {};
-                          }
-                          var rule = opt.r;
-                          if (!opt.hasOwnProperty('i')) {
-                              opt._i = Math.floor((0x99999 - 0x10000) * Math.random()).toString();
-                          }
-                          container.css({
-                              overflow: 'hidden',
-                              whiteSpace: 'nowrap'
-                          });
-
-
-                          var row = $('<div class="form-row"/>').appendTo(container);
-                          var row2 = $('<div class="form-row"/>', { style: "padding-top: 5px; padding-left: 5px;" }).appendTo(container);
-
-                          var oTopicField = $("<input/>", { class: "rowRuleTopic", type: "text", placeholder: "1/1/1, wait or device name", style: "width:140px; margin-left: 5px; text-align: left;" }).appendTo(row);
-                          var oDPTField = $('<select/>', { class: "rowRuleDPT", type: "text", style: "width:160px; margin-left: 5px; text-align: left;" }).appendTo(row);
-                          var finalspan = $('<span/>', { style: "" }).appendTo(row);
-                          finalspan.append(' &#8594; <span class="node-input-rule-index"></span> ');
-                          var oSendField = $('<input/>', { class: "rowRuleSend", type: "text", placeholder: "Value", style: "width:150px; margin-left: 5px; text-align: left;" }).appendTo(row);
-                          var orowRuleDeviceName = $('<input/>', { class: "rowRuleDeviceName", type: "text", style: "width:95%; margin-left: 0px; text-align: left;font-style: italic;", placeholder: "Device Name" }).appendTo(row2);
-
-                          oTopicField.on("change.knxUtilityProfile", function () {
-                              resizeRule(container);
-                          });
-
-                          loadDptOptions(oDPTField, rule.dpt);
-
-                          // Autocomplete suggestion with ETS csv File
-                          oTopicField.autocomplete({
-                              minLength: 0,
-                              source: function (request, response) {
-                                  if (!oNodeServer || !oNodeServer.id) { response([]); return; }
-                                  profileGetJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
-                                      response($.map(data, function (value, key) {
-                                          var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                                          if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
-                                              return {
-                                                  label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
-                                                  value: value.ga // Value
-                                              }
-                                          } else {
-                                              return null;
-                                          }
-                                      }));
-                                  });
-                              }, select: function (event, ui) {
-                                  // Sets Datapoint and device name automatically
-                                  var sDevName = ui.item.label.split("#")[1].trim();
-                                  try {
-                                      sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
-                                      orowRuleDeviceName.val(sDevName);
-                                  } catch (error) {
-                                  }
-                                  var optVal = $(".rowRuleDPT option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
-                                  var $dptSelect = oDPTField;
-                                  if (optVal !== undefined && optVal !== null) {
-                                      $dptSelect.val(optVal).trigger('change');
-                                  } else {
-                                      $dptSelect.trigger('change');
-                                  }
-                              }
-                          });
-                          oTopicField.on('focus.knxUltimateSceneController click.knxUltimateSceneController', function () {
-                              try {
-                                  $(this).autocomplete('search', '');
-                              } catch (error) { /* empty */ }
-                          });
-                          try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting(oTopicField, oNodeServer.id); } catch (e) {}
-
-                          oTopicField.val(rule.topic);
-                          oSendField.val(rule.send);
-                          orowRuleDeviceName.val(rule.devicename);
-                          oTopicField.change();
-                      },
-                      removeItem: function (opt) {
-                      },
-                      resizeItem: resizeRule,
-                      sortItems: function (rules) {
-                      },
-                      sortable: true,
-                      removable: true
-                  });
-
-
-                  // 10/03/2020 For each rule, create a row
-                  for (var i = 0; i < (this.rules || []).length; i++) {
-                      var rule = this.rules[i];
-                      $("#node-input-rule-container").editableList('addItem', { r: rule, i: i });
+                    }))
+                  })
+                },
+                select: function (event, ui) {
+                  // Sets Datapoint and device name automatically
+                  let sDevName = ui.item.label.split('#')[1].trim()
+                  try {
+                    sDevName = sDevName.substr(sDevName.indexOf(')') + 1).trim()
+                    orowRuleDeviceName.val(sDevName)
+                  } catch (error) {
+                  }
+                  const optVal = $(".rowRuleDPT option:contains('" + ui.item.label.split('#')[2].trim() + "')").attr('value')
+                  const $dptSelect = oDPTField
+                  if (optVal !== undefined && optVal !== null) {
+                    $dptSelect.val(optVal).trigger('change')
+                  } else {
+                    $dptSelect.trigger('change')
                   }
+                }
+              })
+              oTopicField.on('focus.knxUltimateSceneController click.knxUltimateSceneController', function () {
+                try {
+                  $(this).autocomplete('search', '')
+                } catch (error) { /* empty */ }
+              })
+              try { if (oNodeServer && oNodeServer.id) KNX_enableSecureFormatting(oTopicField, oNodeServer.id) } catch (e) {}
 
+              oTopicField.val(rule.topic)
+              oSendField.val(rule.send)
+              orowRuleDeviceName.val(rule.devicename)
+              oTopicField.change()
+            },
+            removeItem: function (opt) {
+            },
+            resizeItem: resizeRule,
+            sortItems: function (rules) {
+            },
+            sortable: true,
+            removable: true
+          })
 
-              },
-              oneditcancel: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  $('#node-input-server').off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
-              },
-              oneditsave: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
-
-                  var node = this;
-
-                  var rules = $("#node-input-rule-container").editableList('items');
-                  node.rules = [];
-                  rules.each(function (i) {
-                      var rule = $(this);
-                      var rowRuleTopic = rule.find(".rowRuleTopic").val();
-                      var rowRuleDPT = rule.find(".rowRuleDPT").val();
-                      var rowRuleSend = rule.find(".rowRuleSend").val();
-                      var rowRuleDeviceName = rule.find(".rowRuleDeviceName").val();
-                      node.rules.push({ topic: rowRuleTopic, devicename: rowRuleDeviceName, dpt: rowRuleDPT, send: rowRuleSend });
-                  });
-              },
-              oneditresize: function (size) {
-                  const list = $('#node-input-rule-container');
-                  const listTop = list.offset();
-                  const formTop = $('#dialog-form').offset();
-                  if (!size || !listTop || !formTop) return;
-                  list.editableList('height', Math.max(180, size.height - (listTop.top - formTop.top) - 45));
-              }
+          // 10/03/2020 For each rule, create a row
+          for (let i = 0; i < (this.rules || []).length; i++) {
+            const rule = this.rules[i]
+            $('#node-input-rule-container').editableList('addItem', { r: rule, i })
+          }
+        },
+        oneditcancel: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
+        },
+        oneditsave: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+
+          const node = this
+
+          const rules = $('#node-input-rule-container').editableList('items')
+          node.rules = []
+          rules.each(function (i) {
+            const rule = $(this)
+            const rowRuleTopic = rule.find('.rowRuleTopic').val()
+            const rowRuleDPT = rule.find('.rowRuleDPT').val()
+            const rowRuleSend = rule.find('.rowRuleSend').val()
+            const rowRuleDeviceName = rule.find('.rowRuleDeviceName').val()
+            node.rules.push({ topic: rowRuleTopic, devicename: rowRuleDeviceName, dpt: rowRuleDPT, send: rowRuleSend })
           })
+        },
+        oneditresize: function (size) {
+          const list = $('#node-input-rule-container')
+          const listTop = list.offset()
+          const formTop = $('#dialog-form').offset()
+          if (!size || !listTop || !formTop) return
+          list.editableList('height', Math.max(180, size.height - (listTop.top - formTop.top) - 45))
+        }
+      })
     },
     "loadcontrol": function (RED) {
       const utilityFieldValue = (node, key) => {
         if (node._utilityEditor && typeof $ === 'function') {
-          const field = $('#node-input-' + key);
-          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val();
+          const field = $('#node-input-' + key)
+          if (field.length) return field.is(':checkbox') ? field.is(':checked') : field.val()
         }
-        return node[key];
-      };
+        return node[key]
+      }
       const utilityNumber = (minimum, integer = false, enabled = () => true) => function (value) {
-        if (!enabled(this)) return true;
-        const numeric = Number(value);
+        if (!enabled(this)) return true
+        const numeric = Number(value)
         return value !== null && value !== undefined && String(value).trim() !== '' &&
-          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric));
-      };
+          Number.isFinite(numeric) && numeric >= minimum && (!integer || Number.isInteger(numeric))
+      }
 
       RED.nodes.registerType('knxUltimateLoadControl', {
-              category: "KNX Ultimate",
-              color: '#C7E9C0',
-              defaults: {
-                  server: { type: "knxUltimate-config", required: false },
-                  name: { value: "" },
-                  controlMode: { value: "auto" },
-                  topic: { value: "" },
-                  dpt: { value: "" },
-                  wattLimit: { value: 3000, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'controlMode') !== 'msg') },
-                  sheddingCheckInterval: { value: 15, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'controlMode') !== 'msg') },
-                  sheddingRestoreDelay: { value: 60, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'controlMode') !== 'msg') },
-                  GA1: { value: "" },
-                  DPT1: { value: "" },
-                  Name1: { value: "" },
-                  autoRestore1: { value: true },
-                  MonitorGA1: { value: "" },
-                  MonitorDPT1: { value: "" },
-                  MonitorName1: { value: "" },
-                  GA2: { value: "" },
-                  DPT2: { value: "" },
-                  Name2: { value: "" },
-                  autoRestore2: { value: true },
-                  MonitorGA2: { value: "" },
-                  MonitorDPT2: { value: "" },
-                  MonitorName2: { value: "" },
-                  GA3: { value: "" },
-                  DPT3: { value: "" },
-                  Name3: { value: "" },
-                  autoRestore3: { value: true },
-                  MonitorGA3: { value: "" },
-                  MonitorDPT3: { value: "" },
-                  MonitorName3: { value: "" },
-                  GA4: { value: "" },
-                  DPT4: { value: "" },
-                  Name4: { value: "" },
-                  autoRestore4: { value: true },
-                  MonitorGA4: { value: "" },
-                  MonitorDPT4: { value: "" },
-                  MonitorName4: { value: "" },
-                  GA5: { value: "" },
-                  DPT5: { value: "" },
-                  Name5: { value: "" },
-                  autoRestore5: { value: true },
-                  MonitorGA5: { value: "" },
-                  MonitorDPT5: { value: "" },
-                  MonitorName5: { value: "" }
-              },
-              inputs: 1,
-              outputs: 1,
-              icon: "node-alerter-icon.svg",
-              label: function () {
-                  return (this.name || this.topic || "KNX Load Control");
-              },
-              paletteLabel: "KNX Load Control",
-              oneditprepare: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  const editorSession = { active: true };
-                  this._knxUtilityProfileSession = editorSession;
-                  // Ignore responses belonging to a closed editor or a previous gateway.
-                  const profileGetJSON = (url, callback) => {
-                      const serverId = $('#node-input-server').val();
-                      return $.getJSON(url, (data) => {
-                          if (editorSession.active && $('#node-input-server').val() === serverId) callback(data);
-                      });
-                  };
-
-                  const dptFields = [];
-                  const dptRequests = new Map();
-                  const loadDptOptions = (field, savedValue, track = true) => {
-                      if (track) {
-                          dptFields.push(field);
-                          // Preserve persisted values even when Done is pressed before
-                          // the asynchronous DPT catalog has arrived.
-                          field.append($('<option></option>').attr('value', savedValue || '').text(savedValue || ''));
-                          field.val(savedValue || '');
-                      }
-                      const serverId = $('#node-input-server').val();
-                      if (!dptRequests.has(serverId)) {
-                          dptRequests.set(serverId, new Promise((resolve) => {
-                              profileGetJSON('knxUltimateDpts?serverId=' + encodeURIComponent(serverId || ''), resolve);
-                          }));
-                      }
-                      dptRequests.get(serverId).then((data) => {
-                          if (!editorSession.active || $('#node-input-server').val() !== serverId) return;
-                          const selected = field.val();
-                          field.empty().append($('<option></option>').attr('value', '').text(''));
-                          const rows = Array.isArray(data) ? data : [];
-                          rows.forEach((dpt) => field.append($('<option></option>').attr('value', dpt.value).text(dpt.text)));
-                          if (selected && !rows.some((dpt) => String(dpt.value) === String(selected))) {
-                              field.append($('<option></option>').attr('value', selected).text(selected));
-                          }
-                          field.val(selected || '');
-                      });
-                  };
-                  // Go to the help panel
-                  try {
-                      RED.sidebar.show("help");
-                  } catch (error) { }
+        category: 'KNX Ultimate',
+        color: '#C7E9C0',
+        defaults: {
+          server: { type: 'knxUltimate-config', required: false },
+          name: { value: '' },
+          controlMode: { value: 'auto' },
+          topic: { value: '' },
+          dpt: { value: '' },
+          wattLimit: { value: 3000, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'controlMode') !== 'msg') },
+          sheddingCheckInterval: { value: 15, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'controlMode') !== 'msg') },
+          sheddingRestoreDelay: { value: 60, validate: utilityNumber(0.001, false, (node) => utilityFieldValue(node, 'controlMode') !== 'msg') },
+          GA1: { value: '' },
+          DPT1: { value: '' },
+          Name1: { value: '' },
+          autoRestore1: { value: true },
+          MonitorGA1: { value: '' },
+          MonitorDPT1: { value: '' },
+          MonitorName1: { value: '' },
+          GA2: { value: '' },
+          DPT2: { value: '' },
+          Name2: { value: '' },
+          autoRestore2: { value: true },
+          MonitorGA2: { value: '' },
+          MonitorDPT2: { value: '' },
+          MonitorName2: { value: '' },
+          GA3: { value: '' },
+          DPT3: { value: '' },
+          Name3: { value: '' },
+          autoRestore3: { value: true },
+          MonitorGA3: { value: '' },
+          MonitorDPT3: { value: '' },
+          MonitorName3: { value: '' },
+          GA4: { value: '' },
+          DPT4: { value: '' },
+          Name4: { value: '' },
+          autoRestore4: { value: true },
+          MonitorGA4: { value: '' },
+          MonitorDPT4: { value: '' },
+          MonitorName4: { value: '' },
+          GA5: { value: '' },
+          DPT5: { value: '' },
+          Name5: { value: '' },
+          autoRestore5: { value: true },
+          MonitorGA5: { value: '' },
+          MonitorDPT5: { value: '' },
+          MonitorName5: { value: '' }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: 'node-alerter-icon.svg',
+        label: function () {
+          return (this.name || this.topic || 'KNX Load Control')
+        },
+        paletteLabel: 'KNX Load Control',
+        oneditprepare: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          const editorSession = { active: true }
+          this._knxUtilityProfileSession = editorSession
+          // Ignore responses belonging to a closed editor or a previous gateway.
+          const profileGetJSON = (url, callback) => {
+            const serverId = $('#node-input-server').val()
+            return $.getJSON(url, (data) => {
+              if (editorSession.active && $('#node-input-server').val() === serverId) callback(data)
+            })
+          }
 
-                  var node = this;
-                  var oNodeServer = RED.nodes.node($("#node-input-server").val()); // Store the config-node
+          const dptFields = []
+          const dptRequests = new Map()
+          const loadDptOptions = (field, savedValue, track = true) => {
+            if (track) {
+              dptFields.push(field)
+              // Preserve persisted values even when Done is pressed before
+              // the asynchronous DPT catalog has arrived.
+              field.append($('<option></option>').attr('value', savedValue || '').text(savedValue || ''))
+              field.val(savedValue || '')
+            }
+            const serverId = $('#node-input-server').val()
+            if (!dptRequests.has(serverId)) {
+              dptRequests.set(serverId, new Promise((resolve) => {
+                profileGetJSON('knxUltimateDpts?serverId=' + encodeURIComponent(serverId || ''), resolve)
+              }))
+            }
+            dptRequests.get(serverId).then((data) => {
+              if (!editorSession.active || $('#node-input-server').val() !== serverId) return
+              const selected = field.val()
+              field.empty().append($('<option></option>').attr('value', '').text(''))
+              const rows = Array.isArray(data) ? data : []
+              rows.forEach((dpt) => field.append($('<option></option>').attr('value', dpt.value).text(dpt.text)))
+              if (selected && !rows.some((dpt) => String(dpt.value) === String(selected))) {
+                field.append($('<option></option>').attr('value', selected).text(selected))
+              }
+              field.val(selected || '')
+            })
+          }
+          // Go to the help panel
+          try {
+            RED.sidebar.show('help')
+          } catch (error) { }
 
-                  // 19/02/2020 Used to get the server sooner als deploy.
-                  $("#node-input-server").off(".knxUtilityProfile").on("change.knxUtilityProfile", function () {
-                      try {
-                          oNodeServer = RED.nodes.node($(this).val());
-                          dptFields.forEach((field) => loadDptOptions(field, field.val(), false));
-                      } catch (error) { }
-                  });
+          const node = this
+          let oNodeServer = RED.nodes.node($('#node-input-server').val()) // Store the config-node
 
+          // 19/02/2020 Used to get the server sooner als deploy.
+          $('#node-input-server').off('.knxUtilityProfile').on('change.knxUtilityProfile', function () {
+            try {
+              oNodeServer = RED.nodes.node($(this).val())
+              dptFields.forEach((field) => loadDptOptions(field, field.val(), false))
+            } catch (error) { }
+          })
 
+          loadDptOptions($('#node-input-dpt'), this.dpt)
+          for (let index = 1; index < 6; index++) {
+            loadDptOptions($('#node-input-DPT' + index), this['DPT' + index])
+            loadDptOptions($('#node-input-MonitorDPT' + index), this['MonitorDPT' + index])
+          }
 
-                  loadDptOptions($('#node-input-dpt'), this.dpt);
-                  for (let index = 1; index < 6; index++) {
-                      loadDptOptions($('#node-input-DPT' + index), this['DPT' + index]);
-                      loadDptOptions($('#node-input-MonitorDPT' + index), this['MonitorDPT' + index]);
-                  }
+          const toggleAutoFields = () => {
+            const mode = ($('#node-input-controlMode').val() || 'auto').toString()
+            if (mode === 'msg') {
+              $('.knx-lc-auto-only').hide()
+            } else {
+              $('.knx-lc-auto-only').show()
+            }
+          }
 
-                  const toggleAutoFields = () => {
-                      const mode = ($("#node-input-controlMode").val() || "auto").toString();
-                      if (mode === "msg") {
-                          $(".knx-lc-auto-only").hide();
-                      } else {
-                          $(".knx-lc-auto-only").show();
+          $('#node-input-controlMode').on('change.knxUtilityProfile', toggleAutoFields)
+
+          // Autocomplete suggestion with ETS csv File
+          this.autoComplete = (_Name, _DPT) => {
+            const paramAutoComplete = {
+              minLength: 0,
+              source: function (request, response) {
+                if (!oNodeServer || !oNodeServer.id) { response([]); return }
+                profileGetJSON('knxUltimatecsv?nodeID=' + oNodeServer.id, (data) => {
+                  response($.map(data, function (value, key) {
+                    const sSearch = (value.ga + ' (' + value.devicename + ') DPT' + value.dpt)
+                    if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
+                      return {
+                        label: value.ga + ' # ' + value.devicename + ' # ' + value.dpt, // Label for Display
+                        value: value.ga // Value
                       }
-                  };
-
-                  $("#node-input-controlMode").on("change.knxUtilityProfile", toggleAutoFields);
-
-                  // Autocomplete suggestion with ETS csv File
-                  this.autoComplete = (_Name, _DPT) => {
-                      let paramAutoComplete = {
-                          minLength: 0,
-                          source: function (request, response) {
-                              if (!oNodeServer || !oNodeServer.id) { response([]); return; }
-                              profileGetJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
-                                  response($.map(data, function (value, key) {
-                                      var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
-                                      if (htmlUtilsfullCSVSearch(sSearch, request.term)) {
-                                          return {
-                                              label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
-                                              value: value.ga // Value
-                                          }
-                                      } else {
-                                          return null;
-                                      }
-                                  }));
-                              });
-                          }, select: function (event, ui) {
-                              // Sets Datapoint and device name automatically
-                              var sDevName = ui.item.label.split("#")[1].trim();
-                              try {
-                                  sDevName = sDevName.substr(sDevName.indexOf(")") + 1).trim();
-                              } catch (error) {
-                              }
-                              if (_Name === "name") {
-                                  $("#node-input-" + _Name).val("Load Control for " + sDevName);
-                              } else {
-                                  $("#node-input-" + _Name).val(sDevName);
-                              }
-
-                              var optVal = $("#node-input-dpt option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
-                              var $dptSelect = $("#node-input-" + _DPT);
-                              if (optVal !== undefined && optVal !== null) {
-                                  $dptSelect.val(optVal).trigger('change');
-                              } else {
-                                  $dptSelect.trigger('change');
-                              }
-                          }
-                      };
-                      return paramAutoComplete;
-                  };
-
-                  $("#node-input-topic").autocomplete(this.autoComplete("name", "dpt")).on('focus.knxUltimateLoadControl click.knxUltimateLoadControl', function () {
-                      try {
-                          $(this).autocomplete('search', '');
-                      } catch (error) { /* empty */ }
-                  });
-                  try { var srv = RED.nodes.node($("#node-input-server").val()); if (srv && srv.id) KNX_enableSecureFormatting($("#node-input-topic"), srv.id); } catch (e) {}
-                  for (let index = 1; index < 6; index++) {
-                      $("#node-input-GA" + index).autocomplete(this.autoComplete("Name" + index, "DPT" + index)).on('focus.knxUltimateLoadControl click.knxUltimateLoadControl', function () {
-                          try {
-                              $(this).autocomplete('search', '');
-                          } catch (error) { /* empty */ }
-                      });
-                      $("#node-input-MonitorGA" + index).autocomplete(this.autoComplete("MonitorName" + index, "MonitorDPT" + index)).on('focus.knxUltimateLoadControl click.knxUltimateLoadControl', function () {
-                          try {
-                              $(this).autocomplete('search', '');
-                          } catch (error) { /* empty */ }
-                      });
-                      try { var srv2 = RED.nodes.node($("#node-input-server").val()); if (srv2 && srv2.id) KNX_enableSecureFormatting($("#node-input-GA" + index), srv2.id); } catch (e) {}
-                      try { var srv3 = RED.nodes.node($("#node-input-server").val()); if (srv3 && srv3.id) KNX_enableSecureFormatting($("#node-input-MonitorGA" + index), srv3.id); } catch (e) {}
-                  }
-
-                  toggleAutoFields();
-
-
-              },
-              oneditcancel: function () {
-                  if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false;
-                  $('#node-input-server').off('.knxUtilityProfile');
-                  try { RED.sidebar.show('info'); } catch (error) { }
-              },
-              oneditsave: function () {
-                  // Return to the info tab
-                  try {
-                      RED.sidebar.show("info");
-                  } catch (error) { }
-
-
+                    } else {
+                      return null
+                    }
+                  }))
+                })
               },
-              oneditresize: function (size) {
+              select: function (event, ui) {
+                // Sets Datapoint and device name automatically
+                let sDevName = ui.item.label.split('#')[1].trim()
+                try {
+                  sDevName = sDevName.substr(sDevName.indexOf(')') + 1).trim()
+                } catch (error) {
+                }
+                if (_Name === 'name') {
+                  $('#node-input-' + _Name).val('Load Control for ' + sDevName)
+                } else {
+                  $('#node-input-' + _Name).val(sDevName)
+                }
 
+                const optVal = $("#node-input-dpt option:contains('" + ui.item.label.split('#')[2].trim() + "')").attr('value')
+                const $dptSelect = $('#node-input-' + _DPT)
+                if (optVal !== undefined && optVal !== null) {
+                  $dptSelect.val(optVal).trigger('change')
+                } else {
+                  $dptSelect.trigger('change')
+                }
               }
+            }
+            return paramAutoComplete
+          }
+
+          $('#node-input-topic').autocomplete(this.autoComplete('name', 'dpt')).on('focus.knxUltimateLoadControl click.knxUltimateLoadControl', function () {
+            try {
+              $(this).autocomplete('search', '')
+            } catch (error) { /* empty */ }
           })
+          try { const srv = RED.nodes.node($('#node-input-server').val()); if (srv && srv.id) KNX_enableSecureFormatting($('#node-input-topic'), srv.id) } catch (e) {}
+          for (let index = 1; index < 6; index++) {
+            $('#node-input-GA' + index).autocomplete(this.autoComplete('Name' + index, 'DPT' + index)).on('focus.knxUltimateLoadControl click.knxUltimateLoadControl', function () {
+              try {
+                $(this).autocomplete('search', '')
+              } catch (error) { /* empty */ }
+            })
+            $('#node-input-MonitorGA' + index).autocomplete(this.autoComplete('MonitorName' + index, 'MonitorDPT' + index)).on('focus.knxUltimateLoadControl click.knxUltimateLoadControl', function () {
+              try {
+                $(this).autocomplete('search', '')
+              } catch (error) { /* empty */ }
+            })
+            try { const srv2 = RED.nodes.node($('#node-input-server').val()); if (srv2 && srv2.id) KNX_enableSecureFormatting($('#node-input-GA' + index), srv2.id) } catch (e) {}
+            try { const srv3 = RED.nodes.node($('#node-input-server').val()); if (srv3 && srv3.id) KNX_enableSecureFormatting($('#node-input-MonitorGA' + index), srv3.id) } catch (e) {}
+          }
+
+          toggleAutoFields()
+        },
+        oneditcancel: function () {
+          if (this._knxUtilityProfileSession) this._knxUtilityProfileSession.active = false
+          $('#node-input-server').off('.knxUtilityProfile')
+          try { RED.sidebar.show('info') } catch (error) { }
+        },
+        oneditsave: function () {
+          // Return to the info tab
+          try {
+            RED.sidebar.show('info')
+          } catch (error) { }
+        },
+        oneditresize: function (size) {
+
+        }
+      })
     },
     "hatranslator": function (RED) {
-      const defaultTranslations = 'on:true\noff:false\nactive:true\ninactive:false\nopen:true\nclosed:false\nclose:false\n1:true\n0:false\ntrue:true\nfalse:false\nhome:true\nnot_home:false';
+      const defaultTranslations = 'on:true\noff:false\nactive:true\ninactive:false\nopen:true\nclosed:false\nclose:false\n1:true\n0:false\ntrue:true\nfalse:false\nhome:true\nnot_home:false'
 
       RED.nodes.registerType('knxUltimateHATranslator', {
-          category: 'KNX Ultimate',
-          defaults: {
-              name: { value: '' },
-              payloadPropName: { value: 'payload', required: false },
-              haTranslationTable: { value: defaultTranslations, required: false }
-          },
-          inputs: 1,
-          outputs: 1,
-          icon: 'node-ha-icon.svg',
-          label: function () { return this.name || 'HA -> KNX'; },
-          color: '#AED6F1',
-          paletteLabel: 'Home Assistant translator',
-          oneditprepare: function () {
-              this.editor = RED.editor.createEditor({
-                  id: 'node-input-editorcommandText',
-                  mode: 'ace/mode/text',
-                  value: this.haTranslationTable === undefined || this.haTranslationTable === null ? defaultTranslations : this.haTranslationTable
-              });
-          },
-          oneditsave: function () {
-              // The Utility collects drafts before switching function. Cleanup is a
-              // separate step, so repeated collection must leave Ace usable.
-              if (this.editor) this.haTranslationTable = this.editor.getValue();
-          },
-          oneditresize: function () {
-              if (this.editor) this.editor.resize();
-          },
-          oneditcancel: function () {
-              // Called for both Done and Cancel, and whenever the profile unmounts.
-              // Clear the reference first so cleanup remains idempotent.
-              const editor = this.editor;
-              delete this.editor;
-              if (editor) editor.destroy();
-          }
-      });
+        category: 'KNX Ultimate',
+        defaults: {
+          name: { value: '' },
+          payloadPropName: { value: 'payload', required: false },
+          haTranslationTable: { value: defaultTranslations, required: false }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: 'node-ha-icon.svg',
+        label: function () { return this.name || 'HA -> KNX' },
+        color: '#AED6F1',
+        paletteLabel: 'Home Assistant translator',
+        oneditprepare: function () {
+          this.editor = RED.editor.createEditor({
+            id: 'node-input-editorcommandText',
+            mode: 'ace/mode/text',
+            value: this.haTranslationTable === undefined || this.haTranslationTable === null ? defaultTranslations : this.haTranslationTable
+          })
+        },
+        oneditsave: function () {
+          // The Utility collects drafts before switching function. Cleanup is a
+          // separate step, so repeated collection must leave Ace usable.
+          if (this.editor) this.haTranslationTable = this.editor.getValue()
+        },
+        oneditresize: function () {
+          if (this.editor) this.editor.resize()
+        },
+        oneditcancel: function () {
+          // Called for both Done and Cancel, and whenever the profile unmounts.
+          // Clear the reference first so cleanup remains idempotent.
+          const editor = this.editor
+          delete this.editor
+          if (editor) editor.destroy()
+        }
+      })
     }
   }