node-red-contrib-knx-ultimate 3.2.6 → 3.2.7

package/CHANGELOG.md

@@ -6,6 +6,9 @@
 
 # CHANGELOG
 
+**Version 3.2.7** - September 2024<br/>
+- KNX Node: added "echoed" property to the flow's msg output. See help for further infos.<br/>
+
 **Version 3.2.6** - September 2024<br/>
 - KNXViewer: fixed an issue with the PIN3.<br/>
 

package/nodes/knxUltimate-config.js

@@ -317,6 +317,7 @@ module.exports = (RED) => {
                       _devicename: _oClient.name ? _oClient.name : "",
                       _outputtopic: _oClient.outputtopic,
                       _oNode: _oClient,
+                      _echoed: _echoed
                     });
                     _oClient.previouspayload = ""; // 05/04/2021 Added previous payload
                     _oClient.currentPayload = msg.payload;
@@ -739,6 +740,8 @@ module.exports = (RED) => {
       let _dest = null;
       _dest = _datagram.cEMIMessage.dstAddress.toString();
 
+      _echoed = _echoed || false;
+
       const isRepeated = _datagram.cEMIMessage.control.repeat !== 1;
       // 06/06/2021 Supergiovane: check if i can handle the telegrams with "Repeated" flag
       if (node.ignoreTelegramsWithRepeatedFlag === true && isRepeated) {
@@ -812,6 +815,7 @@ module.exports = (RED) => {
                           _devicename: _input.name ? _input.name : "",
                           _outputtopic: _input.outputtopic,
                           _oNode: null,
+                          _echoed: _echoed
                         });
                         _input.RecallScene(msgRecall.payload, false);
                       } catch (error) { }
@@ -827,6 +831,7 @@ module.exports = (RED) => {
                           _devicename: _input.name || "",
                           _outputtopic: _dest,
                           _oNode: null,
+                          _echoed: _echoed
                         });
                         _input.SaveScene(msgSave.payload, false);
                       } catch (error) { }
@@ -853,6 +858,7 @@ module.exports = (RED) => {
                           _devicename: oDevice.name || "",
                           _outputtopic: oDevice.outputtopic,
                           _oNode: null,
+                          _echoed: _echoed
                         });
                         oDevice.currentPayload = msg.payload;
                         _input.setNodeStatus({
@@ -892,7 +898,8 @@ module.exports = (RED) => {
                   _event: _evt,
                   _Rawvalue: _rawValue,
                   _outputtopic: _dest,
-                  _oNode: _input
+                  _oNode: _input,
+                  _echoed: _echoed
                 });
                 _input.setNodeStatus({
                   fill: "green",
@@ -918,6 +925,7 @@ module.exports = (RED) => {
                     _devicename: _input.name ? _input.name : "",
                     _outputtopic: _input.outputtopic,
                     _oNode: _input,
+                    _echoed: _echoed
                   });
                   // Check RBE INPUT from KNX Bus, to avoid send the payload to the flow, if it's equal to the current payload
                   if (!checkRBEInputFromKNXBusAllowSend(_input, msg.payload)) {
@@ -973,7 +981,8 @@ module.exports = (RED) => {
                   _event: _evt,
                   _Rawvalue: _rawValue,
                   _outputtopic: _dest,
-                  _oNode: _input
+                  _oNode: _input,
+                  _echoed: _echoed
                 });
                 _input.setNodeStatus({
                   fill: "blue",
@@ -1000,6 +1009,7 @@ module.exports = (RED) => {
                     _devicename: _input.name ? _input.name : "",
                     _outputtopic: _input.outputtopic,
                     _oNode: _input,
+                    _echoed: _echoed
                   });
                   // Check RBE INPUT from KNX Bus, to avoid send the payload to the flow, if it's equal to the current payload
                   if (!checkRBEInputFromKNXBusAllowSend(_input, msg.payload)) {
@@ -1054,7 +1064,8 @@ module.exports = (RED) => {
                   _event: _evt,
                   _Rawvalue: null,
                   _outputtopic: _dest,
-                  _oNode: _input
+                  _oNode: _input,
+                  _echoed: _echoed
                 });
                 _input.setNodeStatus({
                   fill: "grey",
@@ -1081,6 +1092,7 @@ module.exports = (RED) => {
                     _devicename: _input.name || "",
                     _outputtopic: _input.outputtopic,
                     _oNode: _input,
+                    _echoed: _echoed
                   });
                   msg.previouspayload = typeof _input.currentPayload !== "undefined" ? _input.currentPayload : ""; // 24/01/2020 Reset previous payload
                   // 24/09/2019 Autorespond to BUS
@@ -1145,6 +1157,7 @@ module.exports = (RED) => {
     }
     // END Handle BUS events---------------------------------------------------------------------------------------
 
+    // oKNXMessage is { grpaddr, payload,dpt,outputtype (write or response),nodecallerid (node caller)}. 06/03/2020 "Read" request does have the lower priority in the queue, so firstly, i search for "read" telegrams and i move it on the top of the queue pile.
     node.sendKNXTelegramToKNXEngine = (_oKNXMessage) => {
       if (node.knxConnection === null || node.linkStatus !== "connected") return;
 
@@ -1157,7 +1170,6 @@ module.exports = (RED) => {
         );
       }
 
-      // oKNXMessage is { grpaddr, payload,dpt,outputtype (write or response),nodecallerid (node caller)}. 06/03/2020 "Read" request does have the lower priority in the queue, so firstly, i search for "read" telegrams and i move it on the top of the queue pile.
 
       // 19/01/2023 FORMATTING THE OUTPUT PAYLOAD (ROUND, ETC) BASED ON THE NODE CONFIG
       //* ********************************************************
@@ -1316,7 +1328,7 @@ module.exports = (RED) => {
     }
 
 
-    function buildInputMessage({ _srcGA, _destGA, _event, _Rawvalue, _inputDpt, _devicename, _outputtopic, _oNode }) {
+    function buildInputMessage({ _srcGA, _destGA, _event, _Rawvalue, _inputDpt, _devicename, _outputtopic, _oNode, _echoed = false }) {
       let sPayloadmeasureunit = "unknown";
       let sDptdesc = "unknown";
       let sPayloadsubtypevalue = "unknown";
@@ -1512,6 +1524,7 @@ module.exports = (RED) => {
           payloadmeasureunit: sPayloadmeasureunit,
           payloadsubtypevalue: sPayloadsubtypevalue,
           gainfo: gainfo,
+          echoed: _echoed,
           knx: {
             event: _event,
             dpt: sInputDpt,

package/nodes/knxUltimate.html

@@ -966,7 +966,8 @@ msg = {
         maingroupnumber:"1"
         middlegroupnumber:"1"
         ganumber:"0"
-    }
+    },
+    echoed:true, // True if the msg is coming from the input PIN, otherwise false if the msg is coming form the KNX BUS.
     knx: { // This is a representation of the KNX BUS telegram, coming from BUS
         event: "GroupValue_Write" // (or "GroupValue_Response", or "GroupValue_Read")
         dpt: "1.001"

package/nodes/knxUltimate.js

@@ -38,7 +38,7 @@ module.exports = function (RED) {
         devicename = devicename || '';
         dpt = (typeof dpt === 'undefined' || dpt == '') ? '' : ` DPT${dpt}`;
         payload = typeof payload === 'object' ? JSON.stringify(payload) : payload;
-        node.status({ fill, shape, text: `${GA + payload + (node.listenallga === true ? ` ${devicename}` : '')} (${dDate.getDate()}, ${dDate.toLocaleTimeString()} ${text}` });
+        node.status({ fill, shape, text: `${GA + payload + (node.listenallga === true ? ` ${devicename}` : '')} (day ${dDate.getDate()}, ${dDate.toLocaleTimeString()}) ${text}` });
         // 16/02/2020 signal errors to the server
         if (fill.toUpperCase() === 'RED') {
           if (node.serverKNX) {
@@ -259,7 +259,11 @@ module.exports = function (RED) {
       }
       // -+++++++++++++++++++++++++++++++++++++++++++
       //#endregion
-
+      // if (msg.echoed !== undefined && msg.echoed === true) {
+      //   node.setNodeStatus({
+      //     fill: 'grey', shape: 'dot', text: 'Output echoed msg', payload: '', GA: node.topic, dpt: '', devicename: '',
+      //   });
+      // }
       if (msg !== undefined) node.send(msg);
     };
 
@@ -561,16 +565,13 @@ module.exports = function (RED) {
           } else {
             try {
               node.currentPayload = msg.payload;// 31/12/2019 Set the current value (because, if the node is a virtual device, then it'll never fire "GroupValue_Write" in the server node, causing the currentPayload to never update)
-              // if (node.serverKNX.linkStatus === "connected") {
-              node.serverKNX.sendKNXTelegramToKNXEngine({
-                grpaddr, payload: msg.payload, dpt, outputtype, nodecallerid: node.id,
-              });
               node.setNodeStatus({
                 fill: 'green', shape: 'dot', text: 'Writing', payload: msg.payload, GA: grpaddr, dpt, devicename: '',
               });
-              // } else {
-              //    node.setNodeStatus({ fill: "grey", shape: "dot", text: "Disconnected", payload: msg.payload, GA: grpaddr, dpt: dpt, devicename: "" });
-              // }
+              // if (node.serverKNX.linkStatus === "connected") {
+              node.serverKNX.sendKNXTelegramToKNXEngine({
+                grpaddr: grpaddr, payload: msg.payload, dpt: dpt, outputtype: outputtype, nodecallerid: node.id,
+              });
             } catch (error) { }
           }
         }

package/package.json

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