node-red-contrib-knx-ultimate 2.2.25 → 2.2.27

package/nodes/knxUltimateHueLight.js

@@ -99,36 +99,56 @@ module.exports = function (RED) {
           case config.GALightSwitch:
             msg.payload = dptlib.fromBuffer(msg.knx.rawValue, dptlib.resolve(config.dptLightSwitch));
             if (msg.payload === true) {
-              // Check wether the user selected specific color/brightness at switch on.
-              let jColorChoosen = null;
-              if (node.DayTime === true && (config.specifySwitchOnBrightness === "yes" || config.specifySwitchOnBrightness === "temperature")) {
-                jColorChoosen = config.colorAtSwitchOnDayTime;
-              } else if (node.DayTime === false && (config.enableDayNightLighting === "yes" || config.enableDayNightLighting === "temperature")) {
-                jColorChoosen = config.colorAtSwitchOnNightTime;
+              let colorChoosen;
+              let temperatureChoosen;
+              let brightnessChoosen;
+              // The light must support the temperature (in this case, colorAtSwitchOnNightTime is an object {kelvin:xx, brightness:yy})
+              if (node.currentHUEDevice.color_temperature !== undefined) {
+                if (node.DayTime === true && config.specifySwitchOnBrightness === "temperature") {
+                  temperatureChoosen = config.colorAtSwitchOnDayTime.kelvin;
+                } else if (node.DayTime === false && config.enableDayNightLighting === "temperature") {
+                  temperatureChoosen = config.colorAtSwitchOnNightTime.kelvin;
+                }
+              }
+              if (node.currentHUEDevice.dimming !== undefined) {
+                // Check wether the user selected specific brightness at switch on (in this case, colorAtSwitchOnNightTime is an object {kelvin:xx, brightness:yy})
+                if (node.DayTime === true && config.specifySwitchOnBrightness === "temperature") {
+                  brightnessChoosen = config.colorAtSwitchOnDayTime.brightness;
+                } else if (node.DayTime === false && config.enableDayNightLighting === "temperature") {
+                  brightnessChoosen = config.colorAtSwitchOnNightTime.brightness;
+                }
+              }
+              if (node.currentHUEDevice.color !== undefined) {
+                // Check wether the user selected specific color at switch on (in this case, colorAtSwitchOnDayTime is a text with HTML web color)
+                if (node.DayTime === true && config.specifySwitchOnBrightness === "yes") {
+                  colorChoosen = config.colorAtSwitchOnDayTime;
+                } else if (node.DayTime === false && config.enableDayNightLighting === "yes") {
+                  colorChoosen = config.colorAtSwitchOnNightTime;
+                }
               }
 
-              // Now we have a jColorChoosen. Proceed illuminating the light
-              if (jColorChoosen !== null && jColorChoosen.kelvin === undefined) {
-                // RGB
+              if (colorChoosen !== undefined) {
+                // Now we have a jColorChoosen. Proceed illuminating the light
                 let gamut = null;
-                if (node.currentHUEDevice !== undefined && node.currentHUEDevice.hasOwnProperty("color") && node.currentHUEDevice.color.hasOwnProperty("gamut_type")) {
+                if (node.currentHUEDevice.color.gamut_type !== undefined) {
                   gamut = node.currentHUEDevice.color.gamut_type;
                 }
-                const dretXY = hueColorConverter.ColorConverter.rgbToXy(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue, gamut);
-                const dbright = hueColorConverter.ColorConverter.getBrightnessFromRGBOrHex(jColorChoosen.red, jColorChoosen.green, jColorChoosen.blue);
+                const dretXY = hueColorConverter.ColorConverter.rgbToXy(colorChoosen.red, colorChoosen.green, colorChoosen.blue, gamut);
+                const dbright = hueColorConverter.ColorConverter.getBrightnessFromRGBOrHex(colorChoosen.red, colorChoosen.green, colorChoosen.blue);
                 node.currentHUEDevice.dimming.brightness = Math.round(dbright, 0);
                 node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
                 state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color: { xy: dretXY } } : { on: { on: false } };
-              } if (jColorChoosen !== null && jColorChoosen.kelvin !== undefined) {
+              } else if (temperatureChoosen !== undefined) {
                 // Kelvin
-                const dbright = jColorChoosen.brightness;
-                const mirek = hueColorConverter.ColorConverter.kelvinToMirek(jColorChoosen.kelvin);
+                const mirek = hueColorConverter.ColorConverter.kelvinToMirek(temperatureChoosen);
                 node.currentHUEDevice.color_temperature.mirek = mirek;
-                node.currentHUEDevice.dimming.brightness = dbright;
+                node.currentHUEDevice.dimming.brightness = brightnessChoosen;
                 node.updateKNXBrightnessState(node.currentHUEDevice.dimming.brightness);
                 // Kelvin temp
-                state = dbright > 0 ? { on: { on: true }, dimming: { brightness: dbright }, color_temperature: { mirek: mirek } } : { on: { on: false } };
-              } else if (jColorChoosen === null || jColorChoosen === undefined) {
+                state = brightnessChoosen > 0 ? { on: { on: true }, dimming: { brightness: brightnessChoosen }, color_temperature: { mirek: mirek } } : { on: { on: false } };
+              } else if (brightnessChoosen !== undefined) {
+                state = brightnessChoosen > 0 ? { on: { on: true }, dimming: { brightness: brightnessChoosen } } : { on: { on: false } };
+              } else {
                 state = { on: { on: true } };
               }
             } else {
@@ -481,7 +501,7 @@ module.exports = function (RED) {
     node.handleSendHUE = (_event) => {
       try {
         if (_event.id === node.hueDevice) {
-          if (node.currentHUEDevice === undefined) {
+          if (node.currentHUEDevice === undefined || node.serverHue === null || node.serverHue === undefined) {
             node.setNodeStatusHue({
               fill: "red",
               shape: "ring",
@@ -494,16 +514,22 @@ module.exports = function (RED) {
           // Output the msg to the flow
           node.send(_event);
 
+          // // DEBUG
+          //delete _event.dimming;
+          //delete _event.color;
+          //delete _event.color_temperature;
+          //delete _event.color_temperature_delta;
+
           // As grouped_light doesn't contain all requested properties, i find the first light in the group, and use this below in the code
           // If the event type is grouped light, and there are missing properties, i infer these missing properties from the first light in the group!
-          if ((_event.hasOwnProperty("color") || _event.hasOwnProperty("dimming")) && _event.type === 'grouped_light') {
+          if ((_event.color !== undefined || _event.dimming !== undefined || _event.color_temperature !== undefined) && _event.type === 'grouped_light') {
             try {
               const firstLightInGroup = node.serverHue.getFirstLightInGroup(_event.id);
               if (firstLightInGroup !== null && firstLightInGroup !== undefined) {
-                if (_event.color === undefined || Object.keys(_event.color).length === 0) {
+                if (_event.color === undefined) {
                   _event.color = firstLightInGroup.color;
                 }
-                if (_event.color_temperature === undefined || Object.keys(_event.color_temperature).length === 0) {
+                if (_event.color_temperature === undefined) {
                   _event.color_temperature = firstLightInGroup.color_temperature;
                 }
               }
@@ -513,23 +539,25 @@ module.exports = function (RED) {
           if (_event.hasOwnProperty("on")) {
             node.updateKNXLightState(_event.on.on);
             // In case of switch off, set the dim to zero
-            if (
-              _event.on.on === false
-              && (config.updateKNXBrightnessStatusOnHUEOnOff === undefined || config.updateKNXBrightnessStatusOnHUEOnOff === "onhueoff")
-            ) {
+            if (_event.on.on === false && (config.updateKNXBrightnessStatusOnHUEOnOff === undefined || config.updateKNXBrightnessStatusOnHUEOnOff === "onhueoff")) {
               node.updateKNXBrightnessState(0);
               //node.currentHUEDevice.dimming.brightness = 0;
+            } else if (_event.on.on === true && node.currentHUEDevice.on.on === false) {
+              // Turn on always update the dimming KNX Status value as well.
+              let brightVal = 100;
+              if (node.currentHUEDevice.dimming !== undefined && node.currentHUEDevice.dimming.brightness !== undefined) brightVal = node.currentHUEDevice.dimming.brightness;
+              node.updateKNXBrightnessState(brightVal);
             }
             node.currentHUEDevice.on.on = _event.on.on;
           }
 
-          if (_event.hasOwnProperty("color")) {
+          if (_event.color !== undefined) { // fixed https://github.com/Supergiovane/node-red-contrib-knx-ultimate/issues/287
             node.updateKNXLightColorState(_event.color);
             node.currentHUEDevice.color = _event.color;
           }
 
           if (_event.hasOwnProperty("dimming") && _event.dimming.brightness !== undefined) {
-            // Every once on a time, the light transmit the brightness value of 0.39.
+            // Once upon n a time, the light transmit the brightness value of 0.39.
             // To avoid wrongly turn light state on, exit
             if (_event.dimming.brightness < 1) _event.dimming.brightness = 0;
             if (node.currentHUEDevice.hasOwnProperty("on") && node.currentHUEDevice.on.on === false && _event.dimming.brightness === 0) {
@@ -658,33 +686,36 @@ module.exports = function (RED) {
 
     node.updateKNXLightColorState = function updateKNXLightColorState(_value, _outputtype = "write") {
       if (config.GALightColorState !== undefined && config.GALightColorState !== "") {
+        if (!_value.hasOwnProperty('xy') || _value.xy.x === undefined) return;
         const knxMsgPayload = {};
         knxMsgPayload.topic = config.GALightColorState;
         knxMsgPayload.dpt = config.dptLightColorState;
-        knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(
-          _value.xy.x,
-          _value.xy.y,
-          node.currentHUEDevice !== undefined ? node.currentHUEDevice.dimming.brightness : 100,
-        );
-        knxMsgPayload.payload = { red: knxMsgPayload.payload.r, green: knxMsgPayload.payload.g, blue: knxMsgPayload.payload.b };
-        // Send to KNX bus
-        if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
-          if (node.server !== null && node.server !== undefined) {
-            node.server.writeQueueAdd({
-              grpaddr: knxMsgPayload.topic,
-              payload: knxMsgPayload.payload,
-              dpt: knxMsgPayload.dpt,
-              outputtype: _outputtype,
-              nodecallerid: node.id,
-            });
+        try {
+          knxMsgPayload.payload = hueColorConverter.ColorConverter.xyBriToRgb(
+            _value.xy.x,
+            _value.xy.y,
+            node.currentHUEDevice !== undefined && node.currentHUEDevice.dimming !== undefined && node.currentHUEDevice.dimming.brightness === undefined ? node.currentHUEDevice.dimming.brightness : 100,
+          );
+          knxMsgPayload.payload = { red: knxMsgPayload.payload.r, green: knxMsgPayload.payload.g, blue: knxMsgPayload.payload.b };
+          // Send to KNX bus
+          if (knxMsgPayload.topic !== "" && knxMsgPayload.topic !== undefined) {
+            if (node.server !== null && node.server !== undefined) {
+              node.server.writeQueueAdd({
+                grpaddr: knxMsgPayload.topic,
+                payload: knxMsgPayload.payload,
+                dpt: knxMsgPayload.dpt,
+                outputtype: _outputtype,
+                nodecallerid: node.id,
+              });
+            }
           }
-        }
-        node.setNodeStatusHue({
-          fill: "blue",
-          shape: "ring",
-          text: "HUE->KNX Color",
-          payload: knxMsgPayload.payload,
-        });
+          node.setNodeStatusHue({
+            fill: "blue",
+            shape: "ring",
+            text: "HUE->KNX Color",
+            payload: knxMsgPayload.payload,
+          });
+        } catch (error) { }
       }
     };
 

package/nodes/knxUltimateHueLightSensor.html

@@ -13,7 +13,7 @@
             namelightsensor: { value: "" },
             GAlightsensor: { value: "" },
             dptlightsensor: { value: "" },
-            readStatusAtStartup: { value: "no" },
+            readStatusAtStartup: { value: "yes" },
 
             hueDevice: { value: "" }
         },

package/nodes/knxUltimateHueLightSensor.js

@@ -7,7 +7,7 @@ module.exports = function (RED) {
     node.topic = node.name;
     node.name = config.name === undefined ? 'Hue' : config.name;
     node.dpt = '';
-    node.notifyreadrequest = false;
+    node.notifyreadrequest = true;
     node.notifyreadrequestalsorespondtobus = 'false';
     node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = '';
     node.notifyresponse = false;
@@ -23,7 +23,8 @@ module.exports = function (RED) {
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
     node.hueDevice = config.hueDevice;
-    node.initializingAtStart = !((config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no"));
+    node.initializingAtStart = !((config.readStatusAtStartup === undefined || config.readStatusAtStartup === "yes"));
+    node.currentDeviceValue = 0;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -39,6 +40,19 @@ module.exports = function (RED) {
 
     // This function is called by the knx-ultimate config node, to output a msg.payload.
     node.handleSend = msg => {
+
+      // Respond to KNX read telegram, by sending the current value as response telegram.
+      if (msg.knx.event === "GroupValue_Read") {
+        switch (msg.knx.destination) {
+          case config.GAlightsensor:
+            // To the KNX bus wires
+            node.sendResponseToKNX(node.currentDeviceValue);
+            break;
+          default:
+            break;
+        }
+      }
+
     };
 
     node.handleSendHUE = _event => {
@@ -57,6 +71,8 @@ module.exports = function (RED) {
             knxMsgPayload.payload = _event.light.light_level === 0 ? 0 : Math.round(Math.pow(10, (_event.light.light_level - 1) / 10000));
             // Send to KNX bus
             if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) node.server.writeQueueAdd({ grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id });
+            node.currentDeviceValue = knxMsgPayload.payload;
+
             node.status({ fill: 'green', shape: 'dot', text: 'HUE->KNX ' + JSON.stringify(knxMsgPayload.payload) + ' (' + new Date().getDate() + ', ' + new Date().toLocaleTimeString() + ')' });
 
             // Setup the output msg
@@ -74,6 +90,20 @@ module.exports = function (RED) {
       }
     };
 
+    node.sendResponseToKNX = (_level) => {
+      const knxMsgPayload = {};
+      knxMsgPayload.topic = config.GAlightsensor;
+      knxMsgPayload.dpt = config.dptlightsensor;
+
+      knxMsgPayload.payload = _level;
+      // Send to KNX bus
+      if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
+        node.server.writeQueueAdd({
+          grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'response', nodecallerid: node.id,
+        });
+      }
+    };
+
     // On each deploy, unsubscribe+resubscribe
     if (node.server) {
       node.server.removeClient(node);

package/nodes/knxUltimateHueTemperatureSensor.html

@@ -13,7 +13,7 @@
             nametemperaturesensor: { value: "" },
             GAtemperaturesensor: { value: "" },
             dpttemperaturesensor: { value: "" },
-            readStatusAtStartup: { value: "no" },
+            readStatusAtStartup: { value: "yes" },
 
             hueDevice: { value: "" }
         },

package/nodes/knxUltimateHueTemperatureSensor.js

@@ -7,7 +7,7 @@ module.exports = function (RED) {
     node.topic = node.name;
     node.name = config.name === undefined ? 'Hue' : config.name;
     node.dpt = '';
-    node.notifyreadrequest = false;
+    node.notifyreadrequest = true;
     node.notifyreadrequestalsorespondtobus = 'false';
     node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = '';
     node.notifyresponse = false;
@@ -23,7 +23,8 @@ module.exports = function (RED) {
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
     node.hueDevice = config.hueDevice;
-    node.initializingAtStart = !((config.readStatusAtStartup === undefined || config.readStatusAtStartup === "no"));
+    node.initializingAtStart = !((config.readStatusAtStartup === undefined || config.readStatusAtStartup === "yes"));
+    node.currentDeviceValue = 0;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -43,6 +44,17 @@ module.exports = function (RED) {
 
     // This function is called by the knx-ultimate config node, to output a msg.payload.
     node.handleSend = (msg) => {
+      // Respond to KNX read telegram, by sending the current value as response telegram.
+      if (msg.knx.event === "GroupValue_Read") {
+        switch (msg.knx.destination) {
+          case config.GAtemperaturesensor:
+            // To the KNX bus wires
+            node.sendResponseToKNX(node.currentDeviceValue);
+            break;
+          default:
+            break;
+        }
+      }
     };
 
     node.handleSendHUE = (_event) => {
@@ -60,6 +72,8 @@ module.exports = function (RED) {
                 grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id,
               });
             }
+            node.currentDeviceValue = knxMsgPayload.payload;
+
             node.status({ fill: 'green', shape: 'dot', text: `HUE->KNX ${JSON.stringify(knxMsgPayload.payload)} (${new Date().getDate()}, ${new Date().toLocaleTimeString()})` });
 
             // Setup the output msg
@@ -79,6 +93,22 @@ module.exports = function (RED) {
       }
     };
 
+
+    node.sendResponseToKNX = (_level) => {
+      const knxMsgPayload = {};
+      knxMsgPayload.topic = config.GAtemperaturesensor;
+      knxMsgPayload.dpt = config.dpttemperaturesensor;
+
+      knxMsgPayload.payload = _level;
+      // Send to KNX bus
+      if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
+        node.server.writeQueueAdd({
+          grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'response', nodecallerid: node.id,
+        });
+      }
+    };
+
+
     // On each deploy, unsubscribe+resubscribe
     if (node.server) {
       node.server.removeClient(node);

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.2.25",
+  "version": "2.2.27",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable. With integrated Philips HUE devices control.",
   "dependencies": {
     "binary-parser": "2.2.1",