node-red-contrib-knx-ultimate 2.2.30 → 2.2.32

package/CHANGELOG.md

@@ -6,6 +6,15 @@
 
 # CHANGELOG
 
+**Version 2.2.32** - December 2023<br/>
+- Quickfix: HUE Light: fixed an issue in the conversion of tunable white from 9.002 to mired and vice versa.<br/>
+- WARNING: the new HUE Scene node is to be considered **BETA (= in testing with user feedback)**.<br/>
+
+**Version 2.2.31** - December 2023<br/>
+- NEW: HUE Scene node: added the status GA and Datapoint, for the scene to send true/false if active/not active. This currently works only for "Single mode".<br/>
+- WARNING: the new HUE Scene node is to be considered **BETA (= in testing with user feedback)**.<br/>
+
+
 **Version 2.2.30** - December 2023<br/>
 - NEW: HUE Scene node: added a "Multi scene" section, more powerful.<br/>
 - HUE Scene: when selecting a group address for the scene, the scene number dropdown list doesn't show up.<br/>

package/KNXEngine/src/dptlib/dpt9.js

@@ -11,7 +11,7 @@ const knxLog = require('./../KnxLog')
 
 const util = require('util')
 // kudos to http://croquetweak.blogspot.gr/2014/08/deconstructing-floats-frexp-and-ldexp.html
-function ldexp (mantissa, exponent) {
+function ldexp(mantissa, exponent) {
   return exponent > 1023 // avoid multiplying by infinity
     ? mantissa * Math.pow(2, 1023) * Math.pow(2, exponent - 1023)
     : exponent < -1074 // avoid multiplying by zero
@@ -19,7 +19,7 @@ function ldexp (mantissa, exponent) {
       : mantissa * Math.pow(2, exponent)
 }
 
-function frexp (value) {
+function frexp(value) {
   if (value === 0) return [value, 0]
   const data = new DataView(new ArrayBuffer(8))
   data.setFloat64(0, value)
@@ -62,6 +62,16 @@ exports.fromBuffer = function (buf) {
     knxLog.get().warn('DPT9.fromBuffer: buf should be 2 bytes long (got %d bytes)', buf.length)
     return null
   } else {
+
+    // Homeassistant:
+    // let data = (buf[0] * 256) + buf[1]
+    // let esponente = (data >> 11) & 0x0F
+    // let significand = data & 0x7FF
+    // let segno = data >> 15
+    // if (segno === 1) { significand = significand - 2048 }
+    // let value = Number.parseFloat(significand << esponente) / 100
+    // return value;
+
     const sign = buf[0] >> 7
     const exponent = (buf[0] & 0b01111000) >> 3
     let mantissa = 256 * (buf[0] & 0b00000111) + buf[1]

package/nodes/knxUltimateHueLight.html

@@ -70,9 +70,11 @@
             if (dpt.value.startsWith(_dpt)) {
               // Adjustment for HUE Temperature
               if (dpt.value.startsWith("7.600")) {
-                $(_destinationWidget).append($("<option></option>").attr("value", dpt.value).text(dpt.text + " - KNX Kelvin range (0K-65535K)"));
+                $(_destinationWidget).append($("<option></option>").attr("value", dpt.value).text(dpt.text + " - KNX Kelvin range 0-65535k (Homeassistant color_temperature_mode: absolute)"));
               } else if (dpt.value.startsWith("9.002")) {
-                $(_destinationWidget).append($("<option></option>").attr("value", dpt.value).text(dpt.text + " - HUE Kelvin range (Default 2000K-6535K"));
+                $(_destinationWidget).append($("<option></option>").attr("value", dpt.value).text(dpt.text + " - HUE Kelvin range 2000-6535k (Homeassistant color_temperature_mode: absolute_float)"));
+              } else if (dpt.value.startsWith("5.001")) {
+                $(_destinationWidget).append($("<option></option>").attr("value", dpt.value).text(dpt.text + " - Homeassistant color_temperature_mode: relative"));
               } else {
                 $(_destinationWidget).append($("<option></option>").attr("value", dpt.value).text(dpt.text));
               }

package/nodes/knxUltimateHueLight.js

@@ -184,7 +184,7 @@ module.exports = function (RED) {
                 // Relative temperature in Kelvin. Use HUE scale.
                 if (msg.payload > 6535) msg.payload = 6535;
                 if (msg.payload < 2000) msg.payload = 2000;
-                retMirek = hueColorConverter.ColorConverter.scale(msg.payload, [2000, 6535], [500, 153]);
+                retMirek = hueColorConverter.ColorConverter.kelvinToMirek(msg.payload);
               }
               state = { color_temperature: { mirek: retMirek } };
               node.serverHue.hueManager.writeHueQueueAdd(node.hueDevice, state, node.isGrouped_light === false ? "setLight" : "setGroupedLight");
@@ -739,7 +739,8 @@ module.exports = function (RED) {
         if (config.dptLightKelvinState === "7.600") {
           knxMsgPayload.payload = hueColorConverter.ColorConverter.scale(_value, [153, 500], [65535, 0]);
         } else if (config.dptLightKelvinState === "9.002") {
-          knxMsgPayload.payload = hueColorConverter.ColorConverter.scale(_value, [153, 500], [6535, 2000]);
+          //knxMsgPayload.payload = hueColorConverter.ColorConverter.scale(_value, [153, 500], [6535, 2000]);
+          knxMsgPayload.payload = hueColorConverter.ColorConverter.mirekToKelvin(_value);
         }
         // Send to KNX bus
         if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {

package/nodes/knxUltimateHueMotion.js

@@ -43,8 +43,6 @@ module.exports = function (RED) {
         if (_event.id === config.hueDevice) {
 
           if (!_event.hasOwnProperty("motion") || _event.motion.motion === undefined) return;
-
-
           const knxMsgPayload = {};
           knxMsgPayload.topic = config.GAmotion;
           knxMsgPayload.dpt = config.dptmotion;

package/nodes/knxUltimateHueScene.html

@@ -15,6 +15,9 @@
             GAscene: { value: "" },
             dptscene: { value: "" },
             valscene: { value: 0 }, // the scene number or true/false
+            namesceneStatus: { value: "" },
+            GAsceneStatus: { value: "" },
+            dptsceneStatus: { value: "" },
 
             enableNodePINS: { value: "no" },
             outputs: { value: 0 },
@@ -39,7 +42,7 @@
             if (Number(this.selectedModeTabNumber) === 0) return this.name;
             if (Number(this.selectedModeTabNumber) === 1) return this.namesceneMulti;
         },
-        paletteLabel: "Hue Scene",
+        paletteLabel: "Hue Scene (Beta)",
         // button: {
         //     enabled: function() {
         //         // return whether or not the button is enabled, based on the current
@@ -105,8 +108,14 @@
                             .attr("value", dpt.value)
                             .text(dpt.text))
                     }
+                    if (dpt.value.startsWith("1.")) {
+                        $("#node-input-dptsceneStatus").append($("<option></option>")
+                            .attr("value", dpt.value)
+                            .text(dpt.text))
+                    }
                 });
                 $("#node-input-dptscene").val(this.dptscene)
+                $("#node-input-dptsceneStatus").val(this.dptsceneStatus)
                 $("#node-input-dptsceneMulti").val(this.dptsceneMulti)
                 ShowHideValScene();
             })
@@ -145,6 +154,39 @@
                     ShowHideValScene();
                 }
             });
+            $("#node-input-GAsceneStatus").autocomplete({
+                minLength: 1,
+                source: function (request, response) {
+                    //$.getJSON("csv", request, function( data, status, xhr ) {
+                    $.getJSON("knxUltimatecsv?nodeID=" + oNodeServer.id, (data) => {
+                        response($.map(data, function (value, key) {
+                            var sSearch = (value.ga + " (" + value.devicename + ") DPT" + value.dpt);
+                            if (fullSearch(sSearch, request.term)) {
+                                if (value.dpt.startsWith("1.")) {
+                                    return {
+                                        label: value.ga + " # " + value.devicename + " # " + value.dpt, // Label for Display
+                                        value: value.ga // Value
+                                    }
+                                } else { return null; }
+                            } 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-namesceneStatus').val(sDevName);
+                    var optVal = $("#node-input-dptsceneStatus option:contains('" + ui.item.label.split("#")[2].trim() + "')").attr('value');
+                    // Select the option value 
+                    $("#node-input-dptsceneStatus").val(optVal);
+                    ShowHideValScene();
+                }
+            });
             $("#node-input-GAsceneMulti").autocomplete({
                 minLength: 1,
                 source: function (request, response) {
@@ -460,12 +502,23 @@
             <label for="node-input-namescene" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
             <input type="text" id="node-input-namescene" style="width:200px;margin-left: 5px; text-align: left;">       
         </div>
-
         <div class="form-row" id="divValScene" hidden>
             <label for="node-input-valscene" style="width:100px;"></label>
             <label for="node-input-valscene" style="width:20px;">#</label>
             <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-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;">
+
+            <label for="node-input-dptsceneStatus" style="width:40px; margin-left: 0px; text-align: right;">DPT</label>
+            <select id="node-input-dptsceneStatus" style="width:140px;"></select>
+
+            <label for="node-input-namesceneStatus" style="width:50px; margin-left: 0px; text-align: right;">Name</label>
+            <input type="text" id="node-input-namesceneStatus" style="width:200px;margin-left: 5px; text-align: left;">       
+        </div>
         <br/>
         <br/>
     </div> <!-- // End Tab 1 -->
@@ -541,6 +594,7 @@ This works also with the HUE scene text field.
 |--|--|
 | Recall | Choose your group address to be used for recalling the HUE scene. In case of Datapoint 1.x, send *true* to that group address to recall the scene, *false* to switch off all lights belonging to the scene. |
 | # | Select the KNX scene number. Visible only with datapoint 18.001. |
+| Status | It's the scene status. *True* when the scene is active, *false* when the scene is not active. |
 
 
 **Multi mode tab**

package/nodes/knxUltimateHueScene.js

@@ -114,9 +114,39 @@ module.exports = function (RED) {
 
     node.handleSendHUE = (_event) => {
       try {
-        if (_event.id === config.hueDevice) {
-          // Output the msg to the flow
-          node.send(_event);
+        if (Number(config.selectedModeTabNumber) === 0 && config.hueDevice !== undefined && _event.id === config.hueDevice) {
+          // Single mode
+          const knxMsgPayload = {};
+          knxMsgPayload.topic = config.GAsceneStatus;
+          knxMsgPayload.dpt = config.dptsceneStatus;
+          if (_event.hasOwnProperty("status") && _event.status.hasOwnProperty("active")) {
+            knxMsgPayload.payload = _event.status.active !== "inactive";
+            // Send to KNX bus
+            if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined && node.server !== undefined) {
+              node.server.writeQueueAdd({
+                grpaddr: knxMsgPayload.topic,
+                payload: knxMsgPayload.payload,
+                dpt: knxMsgPayload.dpt,
+                outputtype: "write",
+                nodecallerid: node.id,
+              });
+            }
+            node.status({
+              fill: "blue",
+              shape: "dot",
+              text: `HUE->KNX ${JSON.stringify(knxMsgPayload.payload)} (${new Date().getDate()}, ${new Date().toLocaleTimeString()})`,
+            });
+            // Output the msg to the flow
+            node.send(_event);
+          }
+        } else if (Number(config.selectedModeTabNumber) === 1 && config.rules !== undefined) {
+          // Multi mode
+          config.rules.forEach(row => {
+            if (row.rowRuleHUESceneID !== undefined && _event.id === row.rowRuleHUESceneID) {
+              // Output the msg to the flow
+              node.send(_event);
+            }
+          });
         }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'HUE->KNX error ' + error.message + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' });

package/nodes/utils/hueColorConverter.js

@@ -24,11 +24,11 @@ class ColorConverter {
   }
 
   static kelvinToMirek(_kelvin) {
-    return Math.round(1000000 / _kelvin, 0);
+    return Math.floor(1000000 / _kelvin);
   }
 
   static mirekToKelvin(_mirek) {
-    return Math.round(1000000 / _mirek, 0);
+    return Math.floor(1000000 / _mirek);
   }
 
   // Linear interpolation of input y given starting and ending ranges

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.30",
+  "version": "2.2.32",
   "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",