node-red-contrib-knx-ultimate 2.2.3 → 2.2.5

package/nodes/knxUltimateHueMotion.js

@@ -22,19 +22,20 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = "leave";
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
-    node.setNodeStatus = ({ fill, shape, text, payload }) => {};
+    node.setNodeStatus = ({ fill, shape, text, payload }) => { };
     // Used to call the status update from the HUE config node.
     node.setNodeStatusHue = ({ fill, shape, text, payload }) => {
-      if (payload === undefined) return;
+      if (payload === undefined) payload = '';
       const dDate = new Date();
       payload = typeof payload === "object" ? JSON.stringify(payload) : payload.toString();
       node.status({ fill, shape, text: `${text} ${payload} (${dDate.getDate()}, ${dDate.toLocaleTimeString()})` });
     };
 
     // This function is called by the knx-ultimate config node, to output a msg.payload.
-    node.handleSend = (msg) => {};
+    node.handleSend = (msg) => { };
 
     node.handleSendHUE = (_event) => {
       try {
@@ -91,7 +92,7 @@ module.exports = function (RED) {
       node.serverHue.addClient(node);
     }
 
-    node.on("input", (msg) => {});
+    node.on("input", (msg) => { });
 
     node.on("close", (done) => {
       if (node.server) {

package/nodes/knxUltimateHueScene.js

@@ -24,6 +24,7 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload }) => {
@@ -31,7 +32,7 @@ module.exports = function (RED) {
     };
     // Used to call the status update from the HUE config node.
     node.setNodeStatusHue = ({ fill, shape, text, payload }) => {
-      if (payload === undefined) return;
+      if (payload === undefined) payload = '';
       const dDate = new Date();
       payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString();
       node.status({ fill, shape, text: text + ' ' + payload + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' });

package/nodes/knxUltimateHueTapDial.js

@@ -25,6 +25,7 @@ module.exports = function (RED) {
     node.formatdecimalsvalue = 2;
     node.brightnessState = 0;
     node.isTimerDimStopRunning = false;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -35,7 +36,7 @@ module.exports = function (RED) {
     node.setNodeStatusHue = ({
       fill, shape, text, payload,
     }) => {
-      if (payload === undefined) return;
+      if (payload === undefined) payload = '';
       const dDate = new Date();
       payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString();
       node.status({ fill, shape, text: `${text} ${payload} (${dDate.getDate()}, ${dDate.toLocaleTimeString()})` });

package/nodes/knxUltimateHueTemperatureSensor.js

@@ -22,6 +22,7 @@ module.exports = function (RED) {
     node.formatmultiplyvalue = 1;
     node.formatnegativevalue = 'leave';
     node.formatdecimalsvalue = 2;
+    node.hueDevice = config.hueDevice;
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({
@@ -33,7 +34,7 @@ module.exports = function (RED) {
     node.setNodeStatusHue = ({
       fill, shape, text, payload,
     }) => {
-      if (payload === undefined) return;
+      if (payload === undefined) payload = '';
       const dDate = new Date();
       payload = typeof payload === 'object' ? JSON.stringify(payload) : payload.toString();
       node.status({ fill, shape, text: `${text} ${payload} (${dDate.getDate()}, ${dDate.toLocaleTimeString()})` });
@@ -84,9 +85,7 @@ module.exports = function (RED) {
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node);
-      if (node.serverHue !== null && node.serverHue.hueManager !== null) {
-        node.serverHue.addClient(node);
-      }
+      node.serverHue.addClient(node);
     }
 
     node.on('input', (msg) => {

package/nodes/knxUltimateLoadControl.js

@@ -334,7 +334,7 @@ module.exports = function (RED) {
         node.send({ topic: node.name || node.topic, operation: 'Enabled', payload: node.sheddingStage })
       }
 
-      // 24/04/2021 if payload is read or the output type is set to "read", do a read
+      // 24/04/2021 if payload is read or the Telegram type is set to "read", do a read
       if ((msg.hasOwnProperty('readstatus') && msg.readstatus === true)) {
         node.initialReadAllDevicesInRules()
       }

package/nodes/locales/en-US/knxUltimate.json

@@ -8,21 +8,21 @@
             "node-input-topic": "Group Addr.",
             "node-input-outputtopic": "Topic",
             "node-input-dpt": "Datapoint",
-            "node-input-initialread": "Read status upon connection",
+            "node-input-initialread": "Read status on start",
             "node-input-initialread0": "No",
-            "node-input-initialread1": "Read from KNX BUS (to receive the response from BUS, enable also -React to event GroupValue response-)",
+            "node-input-initialread1": "Read from KNX BUS (to receive the response from BUS, enable also -React to response telegrams-)",
             "node-input-initialread2": "Read the last value saved to file prior to disconnection",
-            "node-input-initialread3": "Read the last value saved to file prior to disconnection. If the file is missing, read from KNX BUS (to receive the response from BUS, enable also -React to event GroupValue response-)",
-            "node-input-notifyreadrequest": "React to event GroupValue read",
-            "node-input-notifyresponse": "React to event GroupValue response",
-            "node-input-notifywrite": "React to event GroupValue write",
+            "node-input-initialread3": "Read the last value saved to file prior to disconnection. If the file is missing, read from KNX BUS (to receive the response from BUS, enable also -React to response telegrams-)",
+            "node-input-notifyreadrequest": "React to read telegrams",
+            "node-input-notifyresponse": "React to response telegrams",
+            "node-input-notifywrite": "React to write telegrams",
             "node-input-notifyreadrequestalsorespondtobus": "Auto send node value as response to the BUS",
             "node-input-notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "If value is undefined, send",
             "node-input-listenallga": "Universal mode (listen to all Group Addresses)",
             "node-input-name": "Node Name",
-            "node-input-outputtype": "Output Type",
-            "node-input-outputRBE": "Send payload to BUS only if changed (RBE filter)",
-            "node-input-inputRBE": "React only if payload from BUS is changed (RBE filter)",
+            "node-input-outputtype": "Telegram type",
+            "node-input-outputRBE": "Send payload to KNX only if changed (RBE filter)",
+            "node-input-inputRBE": "React only by changed payload (RBE filter)",
             "node-input-formatmultiplyvalue": "Multiply",
             "node-input-formatnegativevalue": "Negatives",
             "node-input-formatdecimalsvalue": "Decimals",
@@ -36,8 +36,8 @@
             "Advancedoptions": "Advanced options",
             "Formatting": "Format INPUT (datagram coming from the KNX BUS)",
             "Operations": "NUMERIC VALUES (operations are performed in order)",
-            "OUTPUT": "OUTPUT (sends datagram to the KNX BUS)",
-            "INPUT": "INPUT (listen to datagram from the KNX BUS)",
+            "OUTPUT": "CONTROL (payload to KNX bus)",
+            "INPUT": "STATUS (payload from KNX BUS)",
             "NUMERICVALUES": "NUMERIC VALUES (operations are performed in order)",
             "noETSWarning": "You haven't imported the ETS csv file. <br/> The node will work as blind transmitter/receiver. <a href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/2.-Node-Configuration\" target='_blank'>Click here for help about that</a>.",
             "notify-DPT3007": "You selected a relative DIM. Please <a target='_blank' href='https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/-Sample---Dimming'>click here to view this sample</a> and learn how to handle such payload.",

package/nodes/locales/en-US/knxUltimateSceneController.html

@@ -11,7 +11,7 @@
         <table style="font-size:12px">
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greendot.png"></img></td>
-                <td>React to event GroupValue write</td>
+                <td>React to write telegrams</td>
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greenring.png"></img></td>
@@ -19,7 +19,7 @@
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/bluedot.png"></img></td>
-                <td>React to event GroupValue response.</td>
+                <td>React to response telegrams.</td>
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/bluering.png"></img></td>
@@ -27,7 +27,7 @@
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greudot.png"></img></td>
-                <td>React to event GroupValue read.</td>
+                <td>React to read telegrams.</td>
             </tr>
             <tr>
                 <td><img src="https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/greyring.png"></img></td>

package/package.json

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