node-red-contrib-knx-ultimate 2.2.31 → 2.2.33

package/CHANGELOG.md

@@ -6,6 +6,14 @@
 
 # CHANGELOG
 
+**Version 2.2.33** - December 2023<br/>
+- Quickfix: HUE Light: fixed an issue in the conversion of tunable white from Datapint 7.600 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.32** - December 2023<br/>
+- Quickfix: HUE Light: fixed an issue in the conversion of tunable white from Datapoint 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/>

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

@@ -175,16 +175,20 @@ module.exports = function (RED) {
               break;
             case config.GALightKelvin:
               let retMirek;
+              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;
-                retMirek = hueColorConverter.ColorConverter.scale(msg.payload, [0, 65535], [500, 153]);
+                // 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]);
+                retMirek = hueColorConverter.ColorConverter.kelvinToMirek(kelvinValue);
               } else if (config.dptLightKelvin === "9.002") {
                 // 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");
@@ -192,7 +196,7 @@ module.exports = function (RED) {
                 fill: "green",
                 shape: "dot",
                 text: "KNX->HUE",
-                payload: msg.payload,
+                payload: kelvinValue,
               });
               break;
             case config.GADaylightSensor:
@@ -526,7 +530,7 @@ module.exports = function (RED) {
           // Output the msg to the flow
           node.send(_event);
 
-          // // DEBUG
+          // // DEBUG testing enable/disable HTML UI Tabs
           //delete _event.dimming;
           //delete _event.color;
           //delete _event.color_temperature;
@@ -734,12 +738,14 @@ module.exports = function (RED) {
     node.updateKNXLightKelvinState = function updateKNXLightKelvinState(_value, _outputtype = "write") {
       if (config.GALightKelvinState !== undefined && config.GALightKelvinState !== "") {
         const knxMsgPayload = {};
+        let kelvinValue = 0;
         knxMsgPayload.topic = config.GALightKelvinState;
         knxMsgPayload.dpt = config.dptLightKelvinState;
         if (config.dptLightKelvinState === "7.600") {
-          knxMsgPayload.payload = hueColorConverter.ColorConverter.scale(_value, [153, 500], [65535, 0]);
+          kelvinValue = hueColorConverter.ColorConverter.mirekToKelvin(_value);
+          knxMsgPayload.payload = hueColorConverter.ColorConverter.scale(kelvinValue, [2000, 6535], [0, 65535]);
         } else if (config.dptLightKelvinState === "9.002") {
-          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) {
@@ -757,7 +763,7 @@ module.exports = function (RED) {
             fill: "blue",
             shape: "ring",
             text: "HUE->KNX Kelvin",
-            payload: knxMsgPayload.payload,
+            payload: kelvinValue,
           });
         }
       }

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.31",
+  "version": "2.2.33",
   "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",