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

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;
@@ -209,6 +225,10 @@ module.exports = function (RED) {
                   }
                 }
               } else {
+                // Stop color cycle
+                if (node.timerColorCycle !== undefined) clearInterval(node.timerColorCycle);
+                // Stop Blinking
+                if (node.timerBlink !== undefined) clearInterval(node.timerBlink);
                 state = { on: { on: false } };
               }
 
@@ -234,11 +254,9 @@ module.exports = function (RED) {
               let kelvinValue = 0;
               msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightKelvin));
               if (config.dptLightKelvin === "7.600") {
-                if (msg.payload > 65535) msg.payload = 65535;
-                if (msg.payload < 0) msg.payload = 0;
-                // kelvinValue = hueColorConverter.ColorConverter.mirekToKelvin(_value);
-                // knxMsgPayload.payload = hueColorConverter.ColorConverter.scale(kelvinValue, [2000, 6535], [0, 65535]);
-                kelvinValue = hueColorConverter.ColorConverter.scale(msg.payload, [0, 65535], [2000, 6535]);
+                if (msg.payload > 6535) msg.payload = 6535;
+                if (msg.payload < 2000) msg.payload = 2000;
+                kelvinValue = msg.payload;//hueColorConverter.ColorConverter.scale(msg.payload, [0, 65535], [2000, 6535]);
                 retMirek = hueColorConverter.ColorConverter.kelvinToMirek(kelvinValue);
               } else if (config.dptLightKelvin === "9.002") {
                 // Relative temperature in Kelvin. Use HUE scale.
@@ -283,22 +301,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;
@@ -373,7 +391,7 @@ module.exports = function (RED) {
                     ? { on: { on: true }, dimming: { brightness: 100 }, dynamics: { duration: 0 } }
                     : { on: { on: false }, dimming: { brightness: 0 }, dynamics: { duration: 0 } };
                   node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
-                }, 1000);
+                }, 1500);
               } else {
                 if (node.timerBlink !== undefined) clearInterval(node.timerBlink);
                 node.serverHue.hueManager.writeHueQueueAdd(
@@ -456,9 +474,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;
@@ -498,8 +516,14 @@ module.exports = function (RED) {
           return;
         }
 
+        // If i'm dimming up while the light is off, start the dim with the initial brightness set to zero
+        if (_KNXbrightness_Direction > 0 && _KNXaction === 1 && node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === false) {
+          node.brightnessStep = null;
+          node.currentHUEDevice.dimming.brightness = 0;
+        }
+
         // Set the actual brightness to start with
-        if (node.brightnessStep === null || node.brightnessStep === undefined) node.brightnessStep = node.currentHUEDevice.dimming.brightness || 50;
+        if (node.brightnessStep === null || node.brightnessStep === undefined) node.brightnessStep = node.currentHUEDevice.dimming.brightness !== undefined ? node.currentHUEDevice.dimming.brightness : 50;
         node.brightnessStep = Math.ceil(Number(node.brightnessStep));
 
         // We have also minDimLevelLight and maxDimLevelLight to take care of.
@@ -524,7 +548,7 @@ module.exports = function (RED) {
             node.updateKNXBrightnessState(node.brightnessStep); // Unnecessary, but necessary to set the KNX Status in real time.
             node.brightnessStep += numStep;
             if (node.brightnessStep > maxDimLevelLight) node.brightnessStep = maxDimLevelLight;
-            hueTelegram = { dimming: { brightness: node.brightnessStep }, dynamics: { duration: _dimSpeedInMillisecs + 100 } }; // + 100 is to avoid ladder effect
+            hueTelegram = { dimming: { brightness: node.brightnessStep }, dynamics: { duration: _dimSpeedInMillisecs + 300 } }; // + 100 is to avoid ladder effect
             // Switch on the light if off
             if (node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === false) {
               hueTelegram.on = { on: true };
@@ -541,7 +565,7 @@ module.exports = function (RED) {
             node.updateKNXBrightnessState(node.brightnessStep); // Unnecessary, but necessary to set the KNX Status in real time.
             node.brightnessStep -= numStep;
             if (node.brightnessStep < minDimLevelLight) node.brightnessStep = minDimLevelLight;
-            hueTelegram = { dimming: { brightness: node.brightnessStep }, dynamics: { duration: _dimSpeedInMillisecs + 100 } };// + 100 is to avoid ladder effect
+            hueTelegram = { dimming: { brightness: node.brightnessStep }, dynamics: { duration: _dimSpeedInMillisecs + 300 } };// + 100 is to avoid ladder effect
             // Switch off the light if on
             if (node.currentHUEDevice.on !== undefined && node.currentHUEDevice.on.on === true && node.brightnessStep === 0) {
               hueTelegram.on = { on: false };
@@ -591,7 +615,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 +632,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 +729,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 +805,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 +829,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/knxUltimateHueLightSensor.html

@@ -69,7 +69,7 @@
 
             // DPT 
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     if (dpt.value.startsWith("9.004")) {
                         $("#node-input-dptlightsensor").append($("<option></option>")
@@ -120,7 +120,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=light_level&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=light_level&serverId=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueMotion.html

@@ -68,7 +68,7 @@
 
             // DPT 
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     if (dpt.value.startsWith("1.")) {
                         $("#node-input-dptmotion").append($("<option></option>")
@@ -119,7 +119,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=motion&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=motion&serverId=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueScene.html

@@ -96,7 +96,7 @@
 
             // DPT 
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     if (dpt.value.startsWith("1.") || dpt.value.startsWith("18.")) {
                         $("#node-input-dptscene").append($("<option></option>")
@@ -244,7 +244,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=scene&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=scene&serverId=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);
@@ -340,7 +340,7 @@
                     rowRuleHUESceneName.autocomplete({
                         minLength: 1,
                         source: function (request, response) {
-                            $.getJSON("KNXUltimateGetResourcesHUE?rtype=scene&nodeID=" + oNodeServerHue.id, (data) => {
+                            $.getJSON("KNXUltimateGetResourcesHUE?rtype=scene&serverId=" + oNodeServerHue.id, (data) => {
                                 response($.map(data.devices, function (value, key) {
                                     //alert(JSON.stringify(value) + " "+ key)
                                     var sSearch = (value.name);
@@ -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/nodes/knxUltimateHueTapDial.html

@@ -69,7 +69,7 @@
 
             // DPT repeat
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     if (dpt.value.startsWith("3.007") || dpt.value.startsWith("5.001") || dpt.value.startsWith("232.600")) {
                         $("#node-input-dptrepeat").append($("<option></option>")
@@ -121,7 +121,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=relative_rotary&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=relative_rotary&serverId=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateHueTemperatureSensor.html

@@ -69,7 +69,7 @@
 
             // DPT 
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     if (dpt.value.startsWith("9.001")) {
                         $("#node-input-dpttemperaturesensor").append($("<option></option>")
@@ -120,7 +120,7 @@
             $("#node-input-name").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
-                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=temperature&nodeID=" + oNodeServerHue.id, (data) => {
+                    $.getJSON("KNXUltimateGetResourcesHUE?rtype=temperature&serverId=" + oNodeServerHue.id, (data) => {
                         response($.map(data.devices, function (value, key) {
                             //alert(JSON.stringify(value) + " "+ key)
                             var sSearch = (value.name);

package/nodes/knxUltimateLoadControl.html

@@ -90,7 +90,7 @@
                 return i == aSearchWords.length;
             }
 
-            $.getJSON("knxUltimateDpts", (data) => {
+            $.getJSON("knxUltimateDpts?serverId=" + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     $("#node-input-dpt").append($("<option></option>").attr("value", dpt.value).text(dpt.text));
                     for (let index = 1; index < 6; index++) {

package/nodes/knxUltimateSceneController.html

@@ -63,7 +63,7 @@
 
             // DPT of Scene Recall
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     $("#node-input-dpt").append($("<option></option>")
                         .attr("value", dpt.value)
@@ -185,7 +185,7 @@
 
             // DPT of Scene Save
             // ########################
-            $.getJSON('knxUltimateDpts', (data) => {
+            $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                 data.forEach(dpt => {
                     $("#node-input-dptSave").append($("<option></option>")
                         .attr("value", dpt.value)
@@ -297,7 +297,7 @@
                         opt.r = {};
                         // Delete saved scene
                         // ##########################################################
-                        $.getJSON("knxultimatescenecontrollerdelete?FileName=" + node.id, new Date().getTime(), (data) => { });
+                        $.getJSON("knxultimatescenecontrollerdelete?FileName=" + node.id + "&serverId=" + $("node-input-server").val(), new Date().getTime(), (data) => { });
                         // ##########################################################
                     }
                     var rule = opt.r;
@@ -324,7 +324,7 @@
                         resizeRule(container);
                     });
 
-                    $.getJSON('knxUltimateDpts', (data) => {
+                    $.getJSON('knxUltimateDpts?serverId=' + $("#node-input-server").val(), (data) => {
                         data.forEach(dpt => {
                             oDPTField.append($("<option></option>")
                                 .attr("value", dpt.value)
@@ -381,8 +381,8 @@
                 removable: true
             });
 
-             // Put some spaces after the container
-             $('<br/><br/><br/>').insertAfter($("#node-input-rule-container"));
+            // Put some spaces after the container
+            $('<br/><br/><br/>').insertAfter($("#node-input-rule-container"));
 
             // 10/03/2020 For each rule, create a row
             for (var i = 0; i < this.rules.length; i++) {

package/nodes/knxUltimateSceneController.js

@@ -31,15 +31,7 @@ module.exports = function (RED) {
     node.icountMessageInWindow = 0
     node.disabled = false // 21/09/2020 you can now disable the scene controller
 
-    // 11/03/2020 Delete scene saved file, from html
-    RED.httpAdmin.get('/knxultimatescenecontrollerdelete', RED.auth.needsPermission('knxUltimateSceneController.read'), function (req, res) {
-      // Delete the file
-      try {
-        const newPath = node.userDir + '/scenecontroller/SceneController_' + req.query.FileName
-        fs.unlinkSync(newPath)
-      } catch (error) { if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.warn('e ' + error) }
-      res.json({ status: 220 })
-    })
+
 
     // 03/09/2021
     async function delay(ms) {

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.3.4",
+  "version": "2.4.1",
   "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",
@@ -23,7 +23,7 @@
   "node-red": {
     "version": ">=2.0.0",
     "nodes": {
-      "commonFunctions": "/nodes/utils/commonFunctions.js",
+      "commonFunctions": "/nodes/commonFunctions.js",
       "knxUltimate": "/nodes/knxUltimate.js",
       "knxUltimateSceneController": "/nodes/knxUltimateSceneController.js",
       "knxUltimateWatchDog": "/nodes/knxUltimateWatchDog.js",

package/nodes/utils/commonFunctions.js

@@ -1,21 +0,0 @@
-// Utility function
-// until node-red 3.1.0, there is a bug creating a plugin, so for backward compatibility, i must use a JS as a node.
-const yaml = require('js-yaml');
-module.exports = function (RED) {
-
-    //RED.log.error("###############################################################")
-    RED.httpAdmin.post("/banana", RED.auth.needsPermission("write"), (req, res) => {
-        var node = RED.nodes.getNode(req.params.id);
-        if (node != null) {
-            try {
-                if (req.body) {
-                    console.log(body);
-                }
-            } catch (err) { }
-        }
-        res.json(req.body)
-    })
-
-
-}
-