@mschaeffler/node-red-logic 2.2.0 → 2.3.0

package/math_mean.html

@@ -13,6 +13,8 @@
                 return v!=='' && !isNaN(v) && Number(v)>0;}
             },
             filter:{value:"0", validate:RED.validators.number()},
+            filterVal:{value:"0", validate:RED.validators.number()},
+            filterMul:{value:"10", validate:RED.validators.number()},
             zeroIsZero:{value:false},
             showState:{value:false}
         },
@@ -59,6 +61,14 @@
         <label for="node-input-filter"><i class="fa fa-filter "></i> Filterzeit</label>
         <input type="text" id="node-input-filter">
     </div>
+    <div class="form-row">
+        <label for="node-input-filterVal"><i class="fa fa-filter "></i> Filter Wert</label>
+        <input type="text" id="node-input-filterVal">
+    </div>
+    <div class="form-row">
+        <label for="node-input-filterMul"><i class="fa fa-filter "></i> Filter Wiederholungsfaktor</label>
+        <input type="text" id="node-input-filterMul">
+    </div>
     <div class="form-row">
         <label for="node-input-zeroIsZero"><i class="fa fa-exclamation-circle"></i> Null ist Null</label>
         <input type="checkbox" id="node-input-zeroIsZero" style="display:inline-block; width:20px; vertical-align:baseline;">
@@ -104,6 +114,10 @@
         <dd> min. amount of data points to generate an output.</dd>
         <dt>Filterzeit <span class="property-type">number</span></dt>
         <dd> send output only after this time.</dd>
+        <dt>Filter Wert <span class="property-type">number</span></dt>
+        <dd> send output only if change is bigger.</dd>
+        <dt>Filter Wiederholungsfaktor <span class="property-type">number</span></dt>
+        <dd> do send output if change is lower then <code>Filter Wert</code> after n times <code>Filterzeit</code>.</dd>
         <dt>Null ist NUll <span class="property-type">boolean</span></dt>
         <dd> If 0 is received, 0 is send immediately.</dd>
         <dt>Status <span class="property-type">boolean</span></dt>

package/math_mean.js

@@ -1,4 +1,5 @@
 module.exports = function(RED) {
+    var tools = require('./tools.js');
 
     function MeanNode(config) {
         RED.nodes.createNode(this,config);
@@ -9,7 +10,9 @@ module.exports = function(RED) {
         this.propertyType = config.propertyType ?? "msg";
         this.deltaTime    = Number( config.deltaTime ?? 60 )*1000;
         this.minData      = Number( config.minData ?? 1 );
-        this.filter       = Number( config.filter ?? 0 )*1000;
+        this.filterTime   = Number( config.filter ?? 0 )*1000;
+        this.filterValue  = Number( config.filterVal ?? 0 );
+        this.filterLongTime = this.filterTime * Number( config.filterMul ?? 10 );
         this.zeroIsZero   = Boolean( config.zeroIsZero );
         this.showState    = Boolean( config.showState );
         if( this.propertyType === "jsonata" )
@@ -88,9 +91,9 @@ module.exports = function(RED) {
                         {
                             msg.payload = value;
                             msg.count   = count;
-                            last[msg.topic] = now;
+                            last[msg.topic] = {value:value,time:now};
                             context.set( "last", last );
-                            node.status({fill:"green",shape:"dot",text:`${item.length} / ${msg.payload.toPrecision(4)}`});
+                            node.status({fill:"green",shape:"dot",text:`${item.length} / ${value.toPrecision(4)}`});
                             send( msg );
                         }
 
@@ -105,13 +108,17 @@ module.exports = function(RED) {
                             {
                                 sum += value.value;
                             }
-                            if( (last[msg.topic]??0)+node.filter < now )
+                            const help  = last[msg.topic];
+                            const value = sum/item.length;
+                            if( help === undefined ||
+                                ( help.time + node.filterTime < now && tools.distance( help.value, value ) >= node.filterValue ) ||
+                                ( node.filterLongTime > 0 && help.time + node.filterLongTime < now  ) )
                             {
-                                sendValue( sum/item.length, item.length );
+                                sendValue( value, item.length );
                             }
                             else
                             {
-                                node.status({fill:"gray",shape:"dot",text:`${item.length} / ${msg.payload.toPrecision(4)}`});
+                                node.status({fill:"gray",shape:"dot",text:`${item.length} / ${value.toPrecision(4)}`});
                             }
                         }
                         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mschaeffler/node-red-logic",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "nodes for simple operations.",
   "license": "LGPL-2.1",
   "homepage": "https://github.com/m-schaeffler/node-red-my-nodes/tree/main/node-red-logic",

package/tools.js

@@ -57,3 +57,8 @@ exports.getPayload = function(node,msg,callback)
         callback( RED.util.getMessageProperty( msg, node.property ) );
     }
 }
+
+exports.distance = function(a,b)
+{
+    return a>b ? a-b : b-a;
+}