node-red-contrib-knx-ultimate 1.3.28 → 1.3.29

package/CHANGELOG.md

@@ -6,6 +6,11 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.3.29</b> - February 2022<br/>
+- Load Control: the timer for shedding won't everytime obey to what you've set. Fixed. <br/>
+- Load Control: Added pre-shedding yellow warning message in the node status.<br/>
+</p>
 <p>
 <b>Version 1.3.28</b> - February 2022<br/>
 - NEW: KNX Viewer: this node allow you to see all datapints and values in a dashboard wirget. https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/knxUltimateViewer<br/>

package/README.md

@@ -7,13 +7,13 @@
 [![NPM downloads total][npm-downloads-total-image]][npm-url]
 [![MIT License][license-image]][license-url]
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-[![Facebook][facebook-image]][facebook-url]
+[![Youtube][youtube-image]][youtube-url]
 [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
 
 
 ![Sample Node](img/readmemain.png)
 
-Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer and gateway simulation. Easy to use and highly configurable.
+Control your KNX intallation via Node-Red! 
 
 **You can use it immediately!**
 ```javascript
@@ -29,7 +29,8 @@ payload = {red:255, green:200, blue:30} // Put some colors in our life
 * **LOGGER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/Logger-Configuration), creates an XML diagnostic file, compatible with ETS. You can open it with ETS for diagnostic pourposes. Node: the Logger currently doesn't record the telegrams coming from KNX-Ultimate if you use a **KNX/IP Interface**. 
 * **GLOBAL CONTEXT node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/GlobalVariable), exposes the group addresses to a Global Context variable, to be used in function nodes.
 * **ALERTER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/Alerter-Configuration). With the Alerter node you can signal to a display or to the node-red-contrib-tts-ultimate node (audio feedback), whenever the selected devices are alerted, i.e. they have payload **true**.
-
+* **LOAD CONTROL node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/LoadControl-Configuration). Control your loads (Oven, Washing machine, etc..) and avoit shutting down the main voltage due to too high power consumption.
+* **VIEWER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/knxUltimateViewer). View all Group Addresses and values of your KNX BUS, in the Node-Red Dashboard.
 
 ## CHANGELOG
 
@@ -67,8 +68,7 @@ Click your language to go to the documentation.<br/>
 ## STARTER PACK
 
 * [Wiki and Help](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki)
-* [Youtube video](https://www.youtube.com/playlist?list=PL9Yh1bjbLAYpfy1Auz6CKDfXUusgMwOQr)
-* [Facebook page](https://www.facebook.com/supergiovaneDev)
+* [Youtube channel](https://www.youtube.com/playlist?list=PL9Yh1bjbLAYpfy1Auz6CKDfXUusgMwOQr)
 * [FAQ + Troubleshoot](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/5.-FAQ-Troubleshoot)
 * [Security best practices](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/SECURITY)
 
@@ -297,11 +297,11 @@ List of commercial companies, which have given us permission to be mentioned on
 ## FRIENDLY COMMUNITIES AROUND THE WORLD
 
 **Italy**
-* [VivereSmart](https://www.facebook.com/groups/viveresmart)
+* [![](https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/c/viveresmart.png)](https://www.facebook.com/groups/viveresmart)
 * [VivereSmart TV](https://www.youtube.com/channel/UC6GlFhcbNuoSEejZ_HlCynA)
 
 **Germany**
-* [knx-user-forum](https://knx-user-forum.de/forum/öffentlicher-bereich/knx-eib-forum/1389088-knx-node-for-node-red)
+* [![](https://raw.githubusercontent.com/Supergiovane/node-red-contrib-knx-ultimate/master/img/c/knxuserforum.png)](https://knx-user-forum.de/forum/öffentlicher-bereich/knx-eib-forum/1389088-knx-node-for-node-red) 
 
 **China**
 * [QQ group: 837579219 （加群需要备注 “来自github”](tencent://groupwpa/?subcmd=all&param=7b2267726f757055696e223a3833373537393231392c2274696d655374616d70223a313633303934363639312c22617574684b6579223a22762b72482b466f4a496a75613033794e4a30744a6970756c55753639424f4d55724f464c4a6c474b77346a30326b7a4f7a3338535536517844684d7756414d62222c2261757468223a22227d&jump_from=)
@@ -319,5 +319,5 @@ List of commercial companies, which have given us permission to be mentioned on
 [npm-version-image]: https://img.shields.io/npm/v/node-red-contrib-knx-ultimate.svg
 [npm-downloads-month-image]: https://img.shields.io/npm/dm/node-red-contrib-knx-ultimate.svg
 [npm-downloads-total-image]: https://img.shields.io/npm/dt/node-red-contrib-knx-ultimate.svg
-[facebook-image]: https://img.shields.io/badge/Visit%20me-Facebook-blue
-[facebook-url]: https://www.facebook.com/supergiovaneDev
+[youtube-image]: https://img.shields.io/badge/Visit%20me-Youtube-red
+[youtube-url]: https://www.youtube.com/channel/UCA9RsLps1IthT7fDSeUbRZw/playlists

package/nodes/knxUltimateLoadControl.js

@@ -81,7 +81,6 @@ module.exports = function (RED) {
                 node.status({ fill: fill, shape: shape, text: text + " Shed:" + node.sheddingStage + " Power:" + node.totalWatt + "W" + " Limit:" + node.wattLimit + "W (" + dDate.getDate() + ", " + dDate.toLocaleTimeString() + ")" });
             } catch (error) {
             }
-
         }
 
         // This function is called by the knx-ultimate config node.
@@ -90,8 +89,13 @@ module.exports = function (RED) {
             // Update the Total Watt?
             if (msg.topic === node.topic && msg.payload !== "" && msg.payload !== null && msg.payload !== undefined) {
                 node.totalWatt = msg.payload;
-                // Update current consumption
-                node.setLocalStatus({ fill: "blue" });
+                // Update current consumption only if the node is in idle state
+                if (node.timerIncreaseShedding === null && node.timerDecreaseShedding === null) {
+                    if (node.setLocalStatusTotalWattTimer === null) clearInterval(node.setLocalStatusTotalWattTimer);
+                    node.setLocalStatusTotalWattTimer = setTimeout(() => {
+                        node.setLocalStatus({ fill: "grey" });
+                    }, 2000);
+                }
                 return;
             }
 
@@ -123,7 +127,7 @@ module.exports = function (RED) {
         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 });
+                if (node.topic !== undefined && node.topic !== null && node.topic !== "") 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;
@@ -143,27 +147,55 @@ module.exports = function (RED) {
             }
         }
 
+        node.startMainTimer = () => {
+            if (node.mainTimer !== null) clearInterval(node.mainTimer);// Clear the timer
+            node.mainTimer = setInterval(() => {
+                // Issue a READ on all GA's                
+                node.initialReadAllDevicesInRules();
+
+                // Check consumption
+                if (node.totalWatt > node.wattLimit) {
+                    // Start increasing shedding!
+                    if (node.sheddingStage < node.deviceList.length) {
+                        if (node.timerIncreaseShedding === null) {
+                            setTimeout(() => {
+                                node.setLocalStatus({ fill: "yellow", shape: "dot", text: "I'm about to shed the load " + node.sheddingStage, payload: "", GA: "", dpt: "", devicename: "" });
+                            }, 2000);
+                            if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding);// Clear the decreasing timer
+                            node.startTimerIncreaseShedding();
+                        }
+                    }
+                } else if (node.totalWatt <= node.wattLimit) {
+                    // Start decreasing shedding!
+                    if (node.sheddingStage > 0) {
+                        if (node.timerDecreaseShedding === null) {
+                            setTimeout(() => {
+                                node.setLocalStatus({ fill: "yellow", shape: "dot", text: "I'm about to unshed the load " + node.sheddingStage, payload: "", GA: "", dpt: "", devicename: "" });
+                            }, 2000);
+                            if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding);// Clear the increasing timer
+                            node.startTimerDecreaseShedding();
+                        }
+                    }
+                }
+            }, 10000);
+        }
 
         // Start the timer
         node.startTimerIncreaseShedding = () => {
 
             // Increase shedding timer (Switch off devices)
-            if (node.timerIncreaseShedding !== null) clearInterval(node.timerIncreaseShedding);
-            node.timerIncreaseShedding = setInterval(() => {
+            if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding);
+            node.timerIncreaseShedding = setTimeout(() => {
                 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.timerIncreaseShedding = null; // Nullify the timer.
             }, node.sheddingCheckInterval);
         }
 
@@ -171,18 +203,18 @@ module.exports = function (RED) {
         node.startTimerDecreaseShedding = () => {
 
             // Decrease shedding timer (Switch devices on again)
-            if (node.timerDecreaseShedding !== null) clearInterval(node.timerDecreaseShedding);
-            node.timerDecreaseShedding = setInterval(() => {
-
-                // Check consumption
-                if (node.totalWatt <= node.wattLimit) {
-                    // Start decreasing shedding!
-                    if (node.sheddingStage > 0) {
-                        node.decreaseShedding();
-                        node.startTimerIncreaseShedding(); // Reset the increasing timer from beginning
+            if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding);
+            node.timerDecreaseShedding = setTimeout(() => {
+                if (node.server) {
+                    // Check consumption
+                    if (node.totalWatt <= node.wattLimit) {
+                        // Start decreasing shedding!
+                        if (node.sheddingStage > 0) {
+                            node.decreaseShedding();
+                        }
                     }
                 }
-
+                node.timerDecreaseShedding = null; // Nullify timer
             }, node.sheddingRestoreDelay);
         }
 
@@ -266,20 +298,18 @@ module.exports = function (RED) {
                     node.setLocalStatus({ fill: "green", shape: "dot", text: "All loads have been restored" });
                 }, 1000);
             }
-
-
         }
 
         // Start
-        node.startTimerIncreaseShedding();
+        node.startMainTimer();
 
         node.on("input", function (msg) {
             if (typeof msg === "undefined") return;
 
             // Reset the shedding and activate all loads
             if (msg.hasOwnProperty("reset")) {
-                if (node.timerDecreaseShedding !== null) clearInterval(node.timerDecreaseShedding);
-                if (node.timerIncreaseShedding !== null) clearInterval(node.timerIncreaseShedding);
+                if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding);
+                if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding);
                 node.sheddingStage = 0;
                 for (let index = 0; index < node.deviceList.length; index++) {
                     const oRow = node.deviceList[index];
@@ -287,16 +317,15 @@ module.exports = function (RED) {
                 }
                 setTimeout(() => {
                     node.setLocalStatus({ fill: "green", shape: "dot", text: "All loads have been restored" });
-                    // Restart shedding timer
-                    node.startTimerIncreaseShedding();
                 }, 1000);
                 node.send({ topic: node.name || node.topic, operation: "Reset", payload: node.sheddingStage });
             }
 
             // Disable the shedding node
             if (msg.hasOwnProperty("disable")) {
-                if (node.timerDecreaseShedding !== null) clearInterval(node.timerDecreaseShedding);
-                if (node.timerIncreaseShedding !== null) clearInterval(node.timerIncreaseShedding);
+                if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding);
+                if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding);
+                if (node.mainTimer !== null) clearInterval(node.mainTimer);
                 setTimeout(() => {
                     node.setLocalStatus({ fill: "grey", shape: "dot", text: "Disabled" });
                 }, 1000);
@@ -305,12 +334,12 @@ module.exports = function (RED) {
 
             // Disable the shedding node
             if (msg.hasOwnProperty("enable")) {
-                if (node.timerDecreaseShedding !== null) clearInterval(node.timerDecreaseShedding);
-                if (node.timerIncreaseShedding !== null) clearInterval(node.timerIncreaseShedding);
+                if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding);
+                if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding);
                 setTimeout(() => {
                     node.setLocalStatus({ fill: "green", shape: "dot", text: "Enabled" });
-                    // Restart shedding timer
-                    node.startTimerIncreaseShedding();
+                    // Restart timer
+                    node.startMainTimer();
                 }, 1000);
                 node.send({ topic: node.name || node.topic, operation: "Enabled", payload: node.sheddingStage });
             }
@@ -323,8 +352,9 @@ module.exports = function (RED) {
         })
 
         node.on("close", function (done) {
-            if (node.timerDecreaseShedding !== null) clearInterval(node.timerDecreaseShedding);
-            if (node.timerIncreaseShedding !== null) clearInterval(node.timerIncreaseShedding);
+            if (node.mainTimer !== null) clearInterval(node.mainTimer);
+            if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding);
+            if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding);
             if (node.server) {
                 node.server.removeClient(node)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.3.28",
+  "version": "1.3.29",
   "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",