node-red-contrib-boolean-logic-ultimate 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.1.7</b> April 2024<br/>
+- Math node: <b>BREAKING CHANGE</b>: in SUBTRACT mode, now you must set a msg.topic to start subtracting from.</br>
+</p>
 <p>
 <b>Version 1.1.5</b> April 2024<br/>
 - Math node: fixed an issue with the "subtract" operator. See contestual help in the node-red help tab.</br>

package/boolean-logic-ultimate/SumUltimate.html

@@ -11,8 +11,8 @@
             },
             math: {
                 value: "sum"
-            }
-
+            },
+            subtractstartfrom: { value: "" }
         },
         inputs: 1,
         outputs: 1,
@@ -27,6 +27,13 @@
         oneditprepare: function () {
             if ($("#node-input-property").val() === "") $("#node-input-property").val("payload");
             $("#node-input-property").typedInput({ default: 'msg', types: ['msg'] });
+            $("#node-input-math").on('change', function () {
+                if ($("#node-input-math").val() === "subtract") {
+                    $("#divSubtractFirst").show()
+                } else {
+                    $("#divSubtractFirst").hide()
+                }
+            })
         }
     });
 </script>
@@ -54,15 +61,20 @@
             <option value="subtract">Subtract</option>
 		</select>
 	</div>
+    <div class="form-row" id="divSubtractFirst" hidden>
+        <label for="node-input-subtractstartfrom"><i class="icon-tag"></i> Subtract from</label>
+        <input type="text" id="node-input-subtractstartfrom" placeholder="Type the msg.topic. See the help.">
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="SumUltimate">
-<p>The pourpose of this node is to do maths on the incoming values. Each incoming message MUST HAVE OWN TOPIC.</p>
+<p>The pourpose of this node is to do maths on the incoming values. Each incoming message MUST HAVE OWN TOPIC, that means, each inbound **msg.topic** must be **different**.</p>
 
 |Property|Description|
 |--|--|
 | Input | It's the msg property to be evaluated. *By default, it is *payload*, but you can also specify other properties, for example "payload.value"* |
-| Operation | Operation to be performed. For **subtract** operation, the **first topic** arriving to the node is the number to subtract to.|
+| Operation | Operation to be performed. |
+| Subtract from | Only visible when the *operation* is **subtract**. The *msg.topic* indicating the start number for subtraction. This can be, for example, ***SolarPower***, indicating the power from wich you could subtract the house power consumption and obtain the power you sell to the grid. Remember, each inbound msg.topic to be subtracted must be different.|
 
 <br/>
 <br/>

package/boolean-logic-ultimate/SumUltimate.js

@@ -4,6 +4,7 @@ module.exports = function (RED) {
 		this.config = config;
 		var node = this;
 		node.math = config.math === undefined ? "sum" : config.math;
+		node.subtractstartfrom = config.subtractstartfrom === undefined ? "" : config.subtractstartfrom;
 		node.topics = [];
 
 		function setNodeStatus({ fill, shape, text }) {
@@ -50,8 +51,11 @@ module.exports = function (RED) {
 
 					// Sum
 					if (!isNaN(ret) && isFinite(ret)) {
-						if (node.topics.find(a => a.id === msg.topic.toString()) === undefined) {
+						let oFound = node.topics.find(a => a.id === msg.topic.toString());
+						if (oFound === undefined) {
 							node.topics.push({ id: msg.topic.toString(), val: ret });
+						} else {
+							oFound.val = ret;
 						}
 
 						var quantita = 0;
@@ -77,12 +81,24 @@ module.exports = function (RED) {
 							msg.average = moltiplicazione / quantita; // Average
 							msg.measurements = quantita; // Topics	
 						} else if (node.math === "subtract") {
-
-							let risultato = node.topics[0].val;
+							let risultato = 0;
+							if (node.subtractstartfrom !== "") {
+								try {
+									risultato = node.topics.find(m => m.id === node.subtractstartfrom).val;
+								} catch (error) {
+									setNodeStatus({ fill: "grey", shape: "ring", text: "Waiting for " + node.subtractstartfrom });
+									return;
+								}
+							} else {
+								setNodeStatus({ fill: "red", shape: "ring", text: "Please specify the topic form subtract to." });
+								return;
+							}
 							quantita = 1;
-							for (let index = 1; index < node.topics.length; index++) {
-								risultato -= node.topics[index].val;
-								++quantita;
+							for (let index = 0; index < node.topics.length; index++) {
+								if (node.topics[index].id !== node.subtractstartfrom) {
+									risultato -= node.topics[index].val;
+									++quantita;
+								}
 							}
 
 							msg.payload = risultato; // Sum
@@ -106,7 +122,7 @@ module.exports = function (RED) {
 			} catch (error) {
 				setNodeStatus({ fill: "red", shape: "ring", text: error.message });
 			}
-			setNodeStatus({ fill: "green", shape: "dot", text: "Sum " + msg.payload });
+			setNodeStatus({ fill: "green", shape: "dot", text: node.math + " " + msg.payload });
 			node.send(msg);
 		});
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-boolean-logic-ultimate",
-    "version": "1.1.5",
+    "version": "1.1.7",
     "description": "A set of Node-RED enhanced boolean logic and utility nodes, flow interruption, blinker, invert, filter, toggle etc.., with persistent values after reboot. Compatible also with Homeassistant values.",
     "author": "Supergiovane (https://github.com/Supergiovane)",
     "dependencies": {