node-red-contrib-knx-ultimate 1.3.21 → 1.3.22

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 <br/>
 <p>
+<b>Version 1.3.22</b> - February 2022<br/>
+- FIX: WriteRaw: some values wasn't sent to the bus due to an hex conversion issue.<br/>
+</p>
+<p>
 <b>Version 1.3.21</b> - January 2022<br/>
 - FIX: Node Logger wasn't correclty logging the bus traffic. Fixed.<br/>
 </p>

package/KNXEngine/KNXClient.js

@@ -352,7 +352,7 @@ class KNXClient extends EventEmitter {
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
-                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true, null);
+                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true);
             } catch (error) {
             }
 
@@ -397,7 +397,7 @@ class KNXClient extends EventEmitter {
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
-                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true, null);
+                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true);
             } catch (error) {
             }
 
@@ -439,13 +439,63 @@ class KNXClient extends EventEmitter {
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
-                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true, null);
+                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true);
             } catch (error) {
             }
 
         }
 
     }
+    // writeRaw(dstAddress, _rawDataBuffer, bitlength) {
+    //     // bitlength is unused and only for backward compatibility
+
+    //     if (this._connectionState !== STATE.CONNECTED) throw new Error("The socket is not connected. Unable to access the KNX BUS");
+
+    //     if (!Buffer.isBuffer(_rawDataBuffer)) {
+    //         if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXClient: writeRaw: Value must be a buffer! ');
+    //         return
+    //     }
+
+    //     // Transform the  "data" into a KNDDataBuffer
+    //     let data = new KNXDataBuffer(_rawDataBuffer);
+
+    //     if (typeof dstAddress === "string") dstAddress = KNXAddress.createFromString(dstAddress, KNXAddress.TYPE_GROUP);
+    //     let srcAddress = this._options.physAddr;
+    //     if (this._options.hostProtocol === "Multicast") {
+    //         // Multicast
+    //         const cEMIMessage = CEMIFactory.CEMIFactory.newLDataIndicationMessage("write", srcAddress, dstAddress, data);
+    //         cEMIMessage.control.ack = 0;
+    //         cEMIMessage.control.broadcast = 1;
+    //         cEMIMessage.control.priority = 3;
+    //         cEMIMessage.control.addressType = 1;
+    //         cEMIMessage.control.hopCount = 6;
+    //         const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXRoutingIndication(cEMIMessage);
+    //         this.send(knxPacketRequest);
+    //         // 06/12/2021 Multivast automaticalli echoes telegrams
+
+    //     } else {
+    //         // Tunneling
+    //         const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("write", srcAddress, dstAddress, data);
+    //         cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+    //         cEMIMessage.control.broadcast = 1;
+    //         cEMIMessage.control.priority = 3;
+    //         cEMIMessage.control.addressType = 1;
+    //         cEMIMessage.control.hopCount = 6;
+    //         this._incSeqNumber(); // 26/12/2021
+    //         const seqNum = this._getSeqNumber();
+    //         const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
+    //         if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
+    //         this.send(knxPacketRequest);
+    //         // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
+    //         try {
+    //             if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true);
+    //         } catch (error) {
+    //         }
+
+    //     }
+
+    // }
+
     writeRaw(dstAddress, _rawDataBuffer, bitlength) {
         // bitlength is unused and only for backward compatibility
 
@@ -456,8 +506,20 @@ class KNXClient extends EventEmitter {
             return
         }
 
-        // Transform the  "data" into a KNDDataBuffer
-        let data = new KNXDataBuffer(_rawDataBuffer)
+
+        let isSixBits = bitlength <= 6;
+        let IDataPoint = {
+            id: "",
+            value: "any",
+            type: { type: isSixBits },
+            bind: null,
+            read: () => null,
+            write: null
+        }
+        // Get the KNDDataBuffer
+        var baseBufferFromBitLenght = Buffer.alloc((bitlength / 8)); // The buffer lenght must be like specified by bitlenght
+        _rawDataBuffer.copy(baseBufferFromBitLenght, 0);
+        let data = new KNXDataBuffer(baseBufferFromBitLenght, IDataPoint);
 
         if (typeof dstAddress === "string") dstAddress = KNXAddress.createFromString(dstAddress, KNXAddress.TYPE_GROUP);
         let srcAddress = this._options.physAddr;
@@ -488,7 +550,7 @@ class KNXClient extends EventEmitter {
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
-                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true, null);
+                if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true);
             } catch (error) {
             }
 
@@ -838,7 +900,7 @@ class KNXClient extends EventEmitter {
                     } catch (error) { }
 
                     try {
-                        this.emit(KNXClientEvents.indication, knxTunnelingRequest, false, msg.toString("hex"));
+                        this.emit(KNXClientEvents.indication, knxTunnelingRequest, false);
                     } catch (error) { }
 
                 } else if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
@@ -883,7 +945,7 @@ class KNXClient extends EventEmitter {
                         } catch (error) { }
                         //this.emit(KNXClientEvents.error, `Unexpected Tunnel Ack ${knxTunnelingAck.seqCounter}`);
                     }
-                } 
+                }
 
             } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_INDICATION) {
 
@@ -905,7 +967,7 @@ class KNXClient extends EventEmitter {
                     } catch (error) { }
 
                     try {
-                        this.emit(KNXClientEvents.indication, knxRoutingInd, false, msg.toString("hex"));
+                        this.emit(KNXClientEvents.indication, knxRoutingInd, false);
                     } catch (error) {
                     }
                 }
@@ -934,7 +996,7 @@ class KNXClient extends EventEmitter {
                                 this.emit(KNXClientEvents.error, KNXConnectionStateResponse.KNXConnectionStateResponse.statusToString(knxConnectionStateResponse.status));
                             } catch (error) {
                             }
-                            this._setDisconnected("Awaiting response "+ this._awaitingResponseType + ", received connection state response  with status " + knxConnectionStateResponse.status);
+                            this._setDisconnected("Awaiting response " + this._awaitingResponseType + ", received connection state response  with status " + knxConnectionStateResponse.status);
                         }
                         else {
                             if (this._heartbeatTimer !== null) clearTimeout(this._heartbeatTimer);

package/nodes/knxUltimate-config.js

@@ -814,8 +814,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
 
         // Handle BUS events
         // ---------------------------------------------------------------------------------------
-        //function handleBusEvents(_evt, _src, _dest, _rawValue, _datagram, _isRepeated) {
-        function handleBusEvents(_datagram, _echoed, _CEMI) {
+        function handleBusEvents(_datagram, _echoed) {
 
 
             // _rawValue
@@ -847,22 +846,20 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
             // 23/03/2021 Supergiovane: Added the CEMI telegram for ETS Diagnostic
             // #####################################################################
             let _cemiETS = "";
-            if (_CEMI !== undefined && _CEMI !== null) {
-                // I'm receiving a telegram from the BUS
+            if (_echoed) {
+                // I'm sending a telegram to the BUS in Tunneling mode, with echo enabled.
+                // Tunnel: TX to BUS: OK
+                try {
+                    let sCemiFromDatagram = _datagram.cEMIMessage.toBuffer().toString("hex");
+                    _cemiETS = "2900BCD0" + sCemiFromDatagram.substr(8);
+                } catch (error) { _cemiETS = ""; }
+            } else {
                 try {
                     // Multicast: RX from BUS: OK
                     // Multicast TX to BUS: OK
                     // Tunnel: RX from BUS: OK
-                    // Tunnel: TX to BUS: see the _echoed below
+                    // Tunnel: TX to BUS: see the _echoed above
                     _cemiETS = _datagram.cEMIMessage.toBuffer().toString("hex")
-                } catch (error) { }
-
-            } else if (_echoed) {
-                // I'm sending a telegram to the BUS
-                // Tunnel: TX to BUS: OK
-                try {
-                    let sCemiFromDatagram = _datagram.cEMIMessage.toBuffer().toString("hex");
-                    _cemiETS = "2900BCD0" + sCemiFromDatagram.substr(8);
                 } catch (error) { _cemiETS = ""; }
             }
             // #####################################################################

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "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.",
   "dependencies": {
     "fs": "0.0.1-security",