node-red-contrib-knx-ultimate 2.3.4 → 2.3.5

package/CHANGELOG.md

@@ -6,6 +6,9 @@
 
 # CHANGELOG
 
+**Version 2.3.5** - Jan 2024<br/>
+- HUE Light: fixed multi HUE Bridge GUI issue.<br/>
+
 **Version 2.3.4** - Jan 2024<br/>
 - HUE Light: fixex tab "DIM/Brightness" inaccessible, when "KNX Brightness Status" was set to use the default knx behaviour.<br/>
 

package/nodes/knxUltimateHueButton.html

@@ -361,7 +361,7 @@
         <input type="text" id="node-input-nameshort_release" style="width:200px;margin-left: 5px; text-align: left;">
     </div>
     <div class="form-row">
-        <label style="width:100px;"><i class="fa fa-play-circle-o"></i> Switch Status</label>
+        <label style="width:100px;"><i class="fa fa-question-circle"></i> Switch Status</label>
 
         <label for="node-input-GAshort_releaseStatus" style="width:20px;">GA</label>
         <input type="text" id="node-input-GAshort_releaseStatus" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">

package/nodes/knxUltimateHueLight.html

@@ -141,14 +141,14 @@
       getDPT("232.600", "#node-input-dptLightColorState");
       getGroupAddress("#node-input-GALightColorState", "#node-input-nameLightColorState", "#node-input-dptLightColorState", " 232.600");
 
-      getDPT("3.007", "#node-input-dptLightHSV");
-      getGroupAddress("#node-input-GALightHSV", "#node-input-nameLightHSV", "#node-input-dptLightHSV", " 3.007");
+      getDPT("3.007", "#node-input-dptLightKelvinDIM");
+      getGroupAddress("#node-input-GALightKelvinDIM", "#node-input-nameLightKelvinDIM", "#node-input-dptLightKelvinDIM", " 3.007");
 
-      getDPT("5.001", "#node-input-dptLightHSVPercentage");
-      getGroupAddress("#node-input-GALightHSVPercentage", "#node-input-nameLightHSVPercentage", "#node-input-dptLightHSVPercentage", " 5.001");
+      getDPT("5.001", "#node-input-dptLightKelvinPercentage");
+      getGroupAddress("#node-input-GALightKelvinPercentage", "#node-input-nameLightKelvinPercentage", "#node-input-dptLightKelvinPercentage", " 5.001");
 
-      getDPT("5.001", "#node-input-dptLightHSVState");
-      getGroupAddress("#node-input-GALightHSVState", "#node-input-nameLightHSVState", "#node-input-dptLightHSVState", " 5.001");
+      getDPT("5.001", "#node-input-dptLightKelvinPercentageState");
+      getGroupAddress("#node-input-GALightKelvinPercentageState", "#node-input-nameLightKelvinPercentageState", "#node-input-dptLightKelvinPercentageState", " 5.001");
 
       getDPT("1.", "#node-input-dptLightBlink");
       getGroupAddress("#node-input-GALightBlink", "#node-input-nameLightBlink", "#node-input-dptLightBlink", " 1.");
@@ -173,15 +173,13 @@
 
 
       // Get the HUE capabilities to enable/disable UI parts
+      var getJsonPromise;
       if ($("#node-input-hueDevice").val() === '') {
         $("#tabs").hide();
       } else {
-        $.getJSON("knxUltimateGetLightObject?id=" + $("#node-input-hueDevice").val().split("#")[0] + "&" + { _: new Date().getTime() }, (data) => {
+        if (getJsonPromise !== undefined) getJsonPromise.abort();
+        getJsonPromise = $.getJSON("knxUltimateGetLightObject?id=" + $("#node-input-hueDevice").val().split("#")[0] + "&" + { _: new Date().getTime() }, (data) => {
           let oLight = data;
-          if (JSON.stringify(data) === "{}") {
-            $("#mainWindow").hide();
-            RED.notify("Please close and reload this window in few seconds. Still querying the HUE Bridge.", { type: "warning", timeout: 8000 });
-          }
           // Check if grouped, to hide/show the "Get current" buttons
           if (oLight.type === "grouped_light") {
             $("#tabs").tabs("enable", "#tabs-4");
@@ -310,6 +308,7 @@
           $("#node-input-specifySwitchOnBrightness").val(node.specifySwitchOnBrightness).trigger('change');
           $("#node-input-enableDayNightLighting").val(node.enableDayNightLighting).trigger('change');
         });
+        setTimeout(function () { if (getJsonPromise !== undefined) getJsonPromise.abort(); }, 10000);
       }
       // Show/Hide the div of the color at swich on
       if (node.specifySwitchOnBrightness === "yes") {
@@ -560,7 +559,7 @@
             $("#node-input-hueDevice").val(ui.item.hueDevice + "#light");
           }
           onEditPrepare(node);
-          $("#tabs").show();
+          //$("#tabs").show();
         },
       });
     }
@@ -594,17 +593,25 @@
         GALightColorState: { value: "" },
         dptLightColorState: { value: "" },
 
-        nameLightHSV: { value: "" },
-        GALightHSV: { value: "" },
-        dptLightHSV: { value: "" },
+        nameLightKelvinDIM: { value: "" },
+        GALightKelvinDIM: { value: "" },
+        dptLightKelvinDIM: { value: "" },
+
+        nameLightKelvinPercentage: { value: "" },
+        GALightKelvinPercentage: { value: "" },
+        dptLightKelvinPercentage: { value: "" },
 
-        nameLightHSVPercentage: { value: "" },
-        GALightHSVPercentage: { value: "" },
-        dptLightHSVPercentage: { value: "" },
+        nameLightKelvinPercentageState: { value: "" },
+        GALightKelvinPercentageState: { value: "" },
+        dptLightKelvinPercentageState: { value: "" },
 
-        nameLightHSVState: { value: "" },
-        GALightHSVState: { value: "" },
-        dptLightHSVState: { value: "" },
+        nameLightKelvin: { value: "" },
+        GALightKelvin: { value: "" },
+        dptLightKelvin: { value: "" },
+
+        nameLightKelvinState: { value: "" },
+        GALightKelvinState: { value: "" },
+        dptLightKelvinState: { value: "" },
 
         nameLightBrightness: { value: "" },
         GALightBrightness: { value: "" },
@@ -626,14 +633,6 @@
         GADaylightSensor: { value: "" },
         dptDaylightSensor: { value: "" },
 
-        nameLightKelvin: { value: "" },
-        GALightKelvin: { value: "" },
-        dptLightKelvin: { value: "" },
-
-        nameLightKelvinState: { value: "" },
-        GALightKelvinState: { value: "" },
-        dptLightKelvinState: { value: "" },
-
         specifySwitchOnBrightness: { value: "temperature" },
         colorAtSwitchOnDayTime: { value: '{"kelvin":3000, "brightness":100 }' },
 
@@ -781,12 +780,12 @@
 
         //#region color_temperature_mode
         // ----------------------------
-        if ($("#node-input-GALightHSVPercentage").val !== '') {
+        if ($("#node-input-GALightKelvinPercentage").val !== '') {
 
           // color_temperature_mode: relative
           sYaml += '  color_temperature_mode: relative' + '\n';
-          sYaml += '  color_temperature_address: "' + $("#node-input-GALightHSVPercentage").val() + '"\n';
-          sYaml += $("#node-input-GALightHSVState").val() != '' ? '  color_temperature_state_address: "' + $("#node-input-GALightHSVState").val() + '"' + "\n" : '';
+          sYaml += '  color_temperature_address: "' + $("#node-input-GALightKelvinPercentage").val() + '"\n';
+          sYaml += $("#node-input-GALightKelvinPercentageState").val() != '' ? '  color_temperature_state_address: "' + $("#node-input-GALightKelvinPercentageState").val() + '"' + "\n" : '';
           sYaml += '  min_kelvin: 2200' + '\n';
           sYaml += '  max_kelvin: 6500' + '\n';
 
@@ -899,7 +898,7 @@
         <input type="text" id="node-input-nameLightSwitch" style="width:190px;margin-left: 5px; text-align: left;">
       </div>
       <div class="form-row">
-        <label for="node-input-nameLightState" style="width:110px;"><i class="fa fa-play-circle-o"></i> Status</label>
+        <label for="node-input-nameLightState" style="width:110px;"><i class="fa fa-question-circle"></i> Status</label>
 
         <label for="node-input-GALightState" style="width:20px;">GA</label>
         <input type="text" id="node-input-GALightState" placeholder="Ex: 1/1/1"
@@ -947,8 +946,7 @@
       </div>
 
       <div class="form-row">
-        <label for="node-input-nameLightBrightnessState" style="width:110px;"><i class="fa fa-play-circle-o"></i>
-          Status</label>
+        <label for="node-input-nameLightBrightnessState" style="width:110px;"><i class="fa fa-question-circle"></i> Status</label>
 
         <label for="node-input-GALightBrightnessState" style="width:20px;"><span
             data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
@@ -989,32 +987,32 @@
     <div id="tabs-3">
       <p>
       <div class="form-row">
-        <label for="node-input-nameLightHSV" style="width:110px;"><i class="fa fa-play-circle-o"></i> Control dim</label>
+        <label for="node-input-nameLightKelvinDIM" style="width:110px;"><i class="fa fa-play-circle-o"></i> Control dim</label>
 
-        <label for="node-input-GALightHSV" style="width:20px;">GA</label>
-        <input type="text" id="node-input-GALightHSV" placeholder="Ex: 1/1/1"
+        <label for="node-input-GALightKelvinDIM" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GALightKelvinDIM" placeholder="Ex: 1/1/1"
           style="width:70px;margin-left: 5px; text-align: left;">
 
-        <label for="node-input-dptLightHSV" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-        <select id="node-input-dptLightHSV" style="width:140px;"></select>
+        <label for="node-input-dptLightKelvinDIM" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptLightKelvinDIM" style="width:140px;"></select>
 
-        <label for="node-input-nameLightHSV" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
-        <input type="text" id="node-input-nameLightHSV" style="width:190px;margin-left: 5px; text-align: left;">
+        <label for="node-input-nameLightKelvinDIM" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-nameLightKelvinDIM" style="width:190px;margin-left: 5px; text-align: left;">
       </div>
       <div class="form-row">
-        <label for="node-input-nameLightHSVPercentage" style="width:110px;"><i class="fa fa-play-circle-o"></i> Control
+        <label for="node-input-nameLightKelvinPercentage" style="width:110px;"><i class="fa fa-play-circle-o"></i> Control
           %</label>
 
-        <label for="node-input-GALightHSVPercentage" style="width:20px;">GA</label>
-        <input type="text" id="node-input-GALightHSVPercentage" placeholder="Ex: 1/1/1"
+        <label for="node-input-GALightKelvinPercentage" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GALightKelvinPercentage" placeholder="Ex: 1/1/1"
           style="width:70px;margin-left: 5px; text-align: left;">
 
-        <label for="node-input-dptLightHSVPercentage" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-        <select id="node-input-dptLightHSVPercentage" style="width:140px;"></select>
+        <label for="node-input-dptLightKelvinPercentage" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptLightKelvinPercentage" style="width:140px;"></select>
 
-        <label for="node-input-nameLightHSVPercentage"
+        <label for="node-input-nameLightKelvinPercentage"
           style="width:50px; margin-left: 0px; text-align: right;">Name</label>
-        <input type="text" id="node-input-nameLightHSVPercentage" style="width:190px;margin-left: 5px; text-align: left;">
+        <input type="text" id="node-input-nameLightKelvinPercentage" style="width:190px;margin-left: 5px; text-align: left;">
       </div>
       <div class="form-row">
         <label for="node-input-nameLightKelvin" style="width:110px;"><i class="fa fa-play-circle-o"></i> Control
@@ -1031,21 +1029,21 @@
         <input type="text" id="node-input-nameLightKelvin" style="width:190px;margin-left: 5px; text-align: left;">
       </div>
       <div class="form-row">
-        <label for="node-input-nameLightHSVState" style="width:110px;"><i class="fa fa-play-circle-o"></i> Status
+        <label for="node-input-nameLightKelvinPercentageState" style="width:110px;"><i class="fa fa-question-circle"></i> Status
           %</label>
 
-        <label for="node-input-GALightHSVState" style="width:20px;">GA</label>
-        <input type="text" id="node-input-GALightHSVState" placeholder="Ex: 1/1/1"
+        <label for="node-input-GALightKelvinPercentageState" style="width:20px;">GA</label>
+        <input type="text" id="node-input-GALightKelvinPercentageState" placeholder="Ex: 1/1/1"
           style="width:70px;margin-left: 5px; text-align: left;">
 
-        <label for="node-input-dptLightHSVState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
-        <select id="node-input-dptLightHSVState" style="width:140px;"></select>
+        <label for="node-input-dptLightKelvinPercentageState" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+        <select id="node-input-dptLightKelvinPercentageState" style="width:140px;"></select>
 
-        <label for="node-input-nameLightHSVState" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
-        <input type="text" id="node-input-nameLightHSVState" style="width:190px;margin-left: 5px; text-align: left;">
+        <label for="node-input-nameLightKelvinPercentageState" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+        <input type="text" id="node-input-nameLightKelvinPercentageState" style="width:190px;margin-left: 5px; text-align: left;">
       </div>
       <div class="form-row">
-        <label for="node-input-nameLightKelvinState" style="width:110px;"><i class="fa fa-play-circle-o"></i> Status
+        <label for="node-input-nameLightKelvinState" style="width:110px;"><i class="fa fa-question-circle"></i> Status
           Kelvin</label>
 
         <label for="node-input-GALightKelvinState" style="width:20px;">GA</label>
@@ -1085,8 +1083,7 @@
         <input type="text" id="node-input-nameLightColor" style="width:190px;margin-left: 5px; text-align: left;">
       </div>
       <div class="form-row">
-        <label for="node-input-nameLightColorState" style="width:110px;"><i class="fa fa-play-circle-o"></i>
-          Status</label>
+        <label for="node-input-nameLightColorState" style="width:110px;"><i class="fa fa-question-circle"></i> Status</label>
 
         <label for="node-input-GALightColorState" style="width:20px;"><span
             data-i18n="knxUltimateHueLight.node-input-GALightState"></span></label>
@@ -1142,7 +1139,7 @@
     <div id="tabs-6">
       <p>
       <div class="form-row">
-        <label style="width:260px;" for="node-input-readStatusAtStartup"><i class="fa fa-play-circle"></i> Read status at
+        <label style="width:260px;" for="node-input-readStatusAtStartup"><i class="fa fa-question-circle"></i> Read status at
           startup</label>
         <select id="node-input-readStatusAtStartup">
           <option value="no">No</option>

package/nodes/knxUltimateHueLight.js

@@ -13,6 +13,22 @@ module.exports = function (RED) {
     const node = this;
     node.server = RED.nodes.getNode(config.server);
     node.serverHue = RED.nodes.getNode(config.serverHue);
+
+    // Convert for backward compatibility
+    if (config.nameLightKelvinDIM === undefined) {
+      config.nameLightKelvinDIM = config.nameLightHSV;
+      config.GALightKelvinDIM = config.GALightHSV;
+      config.dptLightKelvinDIM = config.dptLightHSV;
+
+      config.nameLightKelvinPercentage = config.nameLightHSVPercentage;
+      config.GALightKelvinPercentage = config.GALightHSVPercentage;
+      config.dptLightKelvinPercentage = config.dptLightHSVPercentage;
+
+      config.nameLightKelvinPercentageState = config.nameLightHSVState;
+      config.GALightKelvinPercentageState = config.GALightHSVState;
+      config.dptLightKelvinPercentageState = config.dptLightHSVState;
+    }
+
     node.topic = node.name;
     node.name = config.name === undefined ? "Hue" : config.name;
     node.outputtopic = node.name;
@@ -283,22 +299,22 @@ module.exports = function (RED) {
               });
 
               break;
-            case config.GALightHSV:
-              if (config.dptLightHSV === "3.007") {
+            case config.GALightKelvinDIM:
+              if (config.dptLightKelvinDIM === "3.007") {
                 // MDT smartbutton will dim the color temperature
                 // { decr_incr: 1, data: 1 } : Start increasing until { decr_incr: 0, data: 0 } is received.
                 // { decr_incr: 0, data: 1 } : Start decreasing until { decr_incr: 0, data: 0 } is received.
-                msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightHSV));
+                msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightKelvinDIM));
                 node.hueDimmingTunableWhite(msg.payload.decr_incr, msg.payload.data, 5000);
                 node.setNodeStatusHue({
                   fill: "green", shape: "dot", text: "KNX->HUE", payload: JSON.stringify(msg.payload),
                 });
               }
               break;
-            case config.GALightHSVPercentage:
-              if (config.dptLightHSVPercentage === "5.001") {
+            case config.GALightKelvinPercentage:
+              if (config.dptLightKelvinPercentage === "5.001") {
                 // 0-100% tunable white
-                msg.payload = 100 - dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightHSVPercentage));
+                msg.payload = 100 - dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightKelvinPercentage));
                 // msg.payload = msg.payload <= 0 ? 1 : msg.payload
                 const retMirek = hueColorConverter.ColorConverter.scale(msg.payload, [0, 100], [153, 500]);
                 msg.payload = retMirek;
@@ -456,9 +472,9 @@ module.exports = function (RED) {
               ret = node.currentHUEDevice.color.xy;
               if (ret !== undefined) node.updateKNXLightColorState(node.currentHUEDevice.color, "response");
               break;
-            case config.GALightHSVState:
+            case config.GALightKelvinPercentageState:
               ret = node.currentHUEDevice.color_temperature.mirek;
-              if (ret !== undefined) node.updateKNXLightHSVState(ret, "response");
+              if (ret !== undefined) node.updateKNXLightKelvinPercentageState(ret, "response");
               break;
             case config.GALightBrightnessState:
               ret = node.currentHUEDevice.dimming.brightness;
@@ -591,7 +607,7 @@ module.exports = function (RED) {
           // DIM UP
           if (node.timerStepDimTunableWhite !== undefined) clearInterval(node.timerStepDimTunableWhite);
           node.timerStepDimTunableWhite = setInterval(() => {
-            node.updateKNXLightHSVState(node.brightnessStepTunableWhite); // Unnecessary, but necessary to set the KNX Status in real time.
+            node.updateKNXLightKelvinPercentageState(node.brightnessStepTunableWhite); // Unnecessary, but necessary to set the KNX Status in real time.
             node.brightnessStepTunableWhite += numStepTunableWhite; // *2 to speed up the things
             if (node.brightnessStepTunableWhite > maxDimLevelLightTunableWhite) node.brightnessStepTunableWhite = maxDimLevelLightTunableWhite;
             const hueTelegram = { color_temperature: { mirek: node.brightnessStepTunableWhite }, dynamics: { duration: _dimSpeedInMillisecsTunableWhite } };
@@ -608,7 +624,7 @@ module.exports = function (RED) {
           // DIM DOWN
           if (node.timerStepDimTunableWhite !== undefined) clearInterval(node.timerStepDimTunableWhite);
           node.timerStepDimTunableWhite = setInterval(() => {
-            node.updateKNXLightHSVState(node.brightnessStepTunableWhite); // Unnecessary, but necessary to set the KNX Status in real time.
+            node.updateKNXLightKelvinPercentageState(node.brightnessStepTunableWhite); // Unnecessary, but necessary to set the KNX Status in real time.
             node.brightnessStepTunableWhite -= numStepTunableWhite; // *2 to speed up the things
             if (node.brightnessStepTunableWhite < minDimLevelLightTunableWhite) node.brightnessStepTunableWhite = minDimLevelLightTunableWhite;
             const hueTelegram = { color_temperature: { mirek: node.brightnessStepTunableWhite }, dynamics: { duration: _dimSpeedInMillisecsTunableWhite } };
@@ -705,7 +721,7 @@ module.exports = function (RED) {
             }
           }
           if (deviceByRef.color_temperature !== undefined && deviceByRef.color_temperature.mirek !== undefined) {
-            node.updateKNXLightHSVState(deviceByRef.color_temperature.mirek);
+            node.updateKNXLightKelvinPercentageState(deviceByRef.color_temperature.mirek);
             node.updateKNXLightKelvinState(deviceByRef.color_temperature.mirek);
             node.currentHUEDevice.color_temperature.mirek = deviceByRef.color_temperature.mirek;
           }
@@ -781,12 +797,12 @@ module.exports = function (RED) {
       }
     };
 
-    node.updateKNXLightHSVState = function updateKNXLightHSVState(_value, _outputtype = "write") {
-      if (config.GALightHSVState !== undefined && config.GALightHSVState !== "") {
+    node.updateKNXLightKelvinPercentageState = function updateKNXLightKelvinPercentageState(_value, _outputtype = "write") {
+      if (config.GALightKelvinPercentageState !== undefined && config.GALightKelvinPercentageState !== "") {
         const knxMsgPayload = {};
-        knxMsgPayload.topic = config.GALightHSVState;
-        knxMsgPayload.dpt = config.dptLightHSVState;
-        if (config.dptLightHSVState === "5.001") {
+        knxMsgPayload.topic = config.GALightKelvinPercentageState;
+        knxMsgPayload.dpt = config.dptLightKelvinPercentageState;
+        if (config.dptLightKelvinPercentageState === "5.001") {
           const retPercent = hueColorConverter.ColorConverter.scale(_value, [153, 500], [0, 100]);
           knxMsgPayload.payload = 100 - retPercent;
         }
@@ -805,7 +821,7 @@ module.exports = function (RED) {
         node.setNodeStatusHue({
           fill: "blue",
           shape: "ring",
-          text: "HUE->KNX HSV",
+          text: "HUE->KNX Tunable White",
           payload: knxMsgPayload.payload,
         });
       }

package/nodes/knxUltimateHueScene.html

@@ -508,7 +508,7 @@
             <select id="node-input-valscene" style="width:180px;margin-left: 5px; text-align: left;"></select>
         </div>
         <div class="form-row">
-            <label for="node-input-namesceneStatus" style="width:100px;"><i class="fa fa-play-circle-o"></i> Status</label>
+            <label for="node-input-namesceneStatus" style="width:100px;"><i class="fa fa-question-circle"></i> Status</label>
 
             <label for="node-input-GAsceneStatus" style="width:20px;">GA</label>
             <input type="text" id="node-input-GAsceneStatus" placeholder="Ex: 1/1/1" style="width:70px;margin-left: 5px; text-align: left;">

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "binary-parser": "2.2.1",