node-red-contrib-knx-ultimate 1.3.26 → 1.3.27

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.3.27</b> - February 2022<br/>
+- Load Control: minor fixes + issue a KNX read of Watt values, in case the GA doesn't automatically send a power value on change.<br/>
+</p>
 <p>
 <b>Version 1.3.26</b> - February 2022<br/>
 - FIX: fix a crash occurring it the KNX Gateway is set to "emulate" (that means, don't write to the bus).<br/>

package/nodes/knxUltimateLoadControl.js

@@ -84,7 +84,7 @@ module.exports = function (RED) {
         node.handleSend = msg => {
 
             // Update the Total Watt?
-            if (msg.topic === node.topic) {
+            if (msg.topic === node.topic && msg.payload !== "" && msg.payload !== null && msg.payload !== undefined) {
                 node.totalWatt = msg.payload;
                 // Update current consumption
                 node.setLocalStatus({ fill: "blue" });
@@ -105,7 +105,7 @@ module.exports = function (RED) {
                 // monitorVal: null
 
                 var oRow = node.deviceList[i];
-                if (msg.topic === oRow.monitorGA) {
+                if (msg.topic === oRow.monitorGA && msg.payload !== null && msg.payload !== undefined) {
                     oRow.monitorVal = msg.payload;
                     //node.setLocalStatus({ fill: "blue", shape: "dot", text: "Updated", payload: oRow.monitorVal, GA: msg.topic, dpt: "", devicename: oRow.monitorName });
                 }
@@ -118,13 +118,16 @@ module.exports = function (RED) {
         // 03/02/2022 perform a read on all GA in the list
         node.initialReadAllDevicesInRules = () => {
             if (node.server) {
+                // Read status of the Total Power GA
+                node.server.writeQueueAdd({ grpaddr: node.topic, payload: "", dpt: "", outputtype: "read", nodecallerid: node.id });
+
                 for (var i = 0; i < node.deviceList.length; i++) {
                     let grpaddr = node.deviceList[i].monitorGA;
-                    if (grpaddr !== undefined && grpaddr !== "") {
+                    if (grpaddr !== undefined && grpaddr !== "" && grpaddr !== null) {
                         try {
                             // Check if it's a group address
                             let ret = Address.KNXAddress.createFromString(grpaddr, Address.KNXAddress.TYPE_GROUP);
-                            node.setLocalStatus({ fill: "grey", shape: "dot", text: "Read Power from BUS" });
+                            //node.setLocalStatus({ fill: "grey", shape: "dot", text: "Read Power from BUS" });
                             node.server.writeQueueAdd({ grpaddr: grpaddr, payload: "", dpt: "", outputtype: "read", nodecallerid: node.id });
                         } catch (error) {
                             node.setLocalStatus({ fill: "grey", shape: "dot", text: "Not a KNX GA " + error.message });
@@ -143,16 +146,18 @@ module.exports = function (RED) {
             // Increase shedding timer (Switch off devices)
             if (node.timerIncreaseShedding !== null) clearInterval(node.timerIncreaseShedding);
             node.timerIncreaseShedding = setInterval(() => {
-
-                // Issue a READ request to the main Watt GA
-                if (node.topic !== undefined && node.topic !== null && node.topic !== "") node.server.writeQueueAdd({ grpaddr: node.ga, payload: "", dpt: "", outputtype: "read", nodecallerid: node.id });
-
-                // Check consumption
-                if (node.totalWatt > node.wattLimit) {
-                    // Start increasing shedding!
-                    if (node.sheddingStage < node.deviceList.length) {
-                        node.increaseShedding();
-                        node.startTimerDecreaseShedding();
+                if (node.server) {
+                    // Issue a READ request to the main Watt GA
+                    // The devices should automatically send a value on change, but... you know....
+                    if (node.topic !== undefined && node.topic !== null && node.topic !== "") node.server.writeQueueAdd({ grpaddr: node.topic, payload: "", dpt: "", outputtype: "read", nodecallerid: node.id });
+
+                    // Check consumption
+                    if (node.totalWatt > node.wattLimit) {
+                        // Start increasing shedding!
+                        if (node.sheddingStage < node.deviceList.length) {
+                            node.increaseShedding();
+                            node.startTimerDecreaseShedding(); // Reset the decreasing timer from beginning
+                        }
                     }
                 }
             }, node.sheddingCheckInterval);
@@ -170,6 +175,7 @@ module.exports = function (RED) {
                     // Start decreasing shedding!
                     if (node.sheddingStage > 0) {
                         node.decreaseShedding();
+                        node.startTimerIncreaseShedding(); // Reset the increasing timer from beginning
                     }
                 }
 

package/package.json

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