@mschaeffler/node-red-logic 4.3.3 → 4.4.0

package/README.md

@@ -349,6 +349,9 @@ Trigger message, in case an edge is detected.
 for `falling edge`, `raising edge` and `hysteresis`:
 * [Eugene Schava](https://github.com/eschava/node-red-contrib-edge-trigger)
 
+for lowpass icon:
+* [Cabfdb - Eigenes Werk, CC BY-SA 3.0](https://commons.wikimedia.org/w/index.php?curid=9651125)
+
 ## License
 
 LGPL-2.1

package/icons/lowpassfilter.svg

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="188.59811"
+   height="187.48582"
+   id="svg3970"
+   version="1.1"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="Low-pass_filter.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs3972">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3978" />
+    <inkscape:perspective
+       id="perspective3951"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#ffffff"
+     borderopacity="0.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="0"
+     inkscape:zoom="5.9508176"
+     inkscape:cx="93.264495"
+     inkscape:cy="90.743833"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3440"
+     inkscape:window-height="1366"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata3975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(271.34805,-134.11113)">
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -240.65258,203.78557 c 0,0 28.57143,-61.42858 62.14286,0 33.57143,61.42856 61.42857,-1.07143 61.42857,-1.07143"
+       id="path2876"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -190.04518,216.95956 26.53923,-25.16392"
+       id="path2878" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -240.0424,249.87743 c 0,0 28.57143,-61.42856 62.14286,0 33.57143,61.42857 61.42857,-1.07143 61.42857,-1.07143"
+       id="path2876-0"
+       sodipodi:nodetypes="csc" />
+  </g>
+</svg>

package/logic_blinker.js

@@ -9,11 +9,11 @@ module.exports = function(RED) {
         this.onTime      = Number( config.onTime  ?? 1 ) * tools.timeUnits( config.onTimeUnit  );
         this.offTime     = Number( config.offTime ?? 1 ) * tools.timeUnits( config.offTimeUnit );
         this.firstType   = config.outputFirstType ?? "bool";
-        this.lastType    = config.outputLastType ?? "bool";
-        this.outputFirst = RED.util.evaluateNodeProperty( config.outputFirst ?? "true",  this.firstType );
-        this.outputOn    = RED.util.evaluateNodeProperty( config.outputOn    ?? "true",  config.outputOnType  ?? "bool" );
-        this.outputOff   = RED.util.evaluateNodeProperty( config.outputOff   ?? "false", config.outputOffType ?? "bool" );
-        this.outputLast  = RED.util.evaluateNodeProperty( config.outputLast  ?? "false", this.lastType );
+        this.lastType    = config.outputLastType  ?? "bool";
+        this.configOutputFirst = RED.util.evaluateNodeProperty( config.outputFirst ?? "true",  this.firstType );
+        this.configOutputOn    = RED.util.evaluateNodeProperty( config.outputOn    ?? "true",  config.outputOnType  ?? "bool" );
+        this.configOutputOff   = RED.util.evaluateNodeProperty( config.outputOff   ?? "false", config.outputOffType ?? "bool" );
+        this.configOutputLast  = RED.util.evaluateNodeProperty( config.outputLast  ?? "false", this.lastType );
         this.filter      = Boolean( config.filter );
         this.showState   = Boolean( config.showState );
         this.timerOn     = null;
@@ -95,6 +95,13 @@ module.exports = function(RED) {
                 done();
                 return;
             }
+            if( msg.output || node.outputFirst === undefined )
+            {
+                node.outputFirst = msg.output?.first ?? node.configOutputFirst;
+                node.outputOn    = msg.output?.on    ?? node.configOutputOn;
+                node.outputOff   = msg.output?.off   ?? node.configOutputOff;
+                node.outputLast  = msg.output?.last  ?? node.configOutputLast;
+            }
             node.state = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
             if( node.state !== null )
             {

package/math_lowpass.html

@@ -18,13 +18,14 @@
         },
         inputs:1,
         outputs:1,
-        icon:"smooth.png",
+        icon:"lowpassfilter.svg",
         label: function() {
             return this.name||this.topic||"lowPass";
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
         },
+        paletteLabel: "lowPass",
         inputLabels: 'input',
         outputLabels: 'output',
         oneditprepare: function() {
@@ -90,7 +91,7 @@
 
 <script type="text/html" data-help-name="lowpass">
     
-    <p>Filter the values of one or more data streams wuth an adaptive Kalman filter.</p>
+    <p>Filter the values of one or more data streams with a recursive low pass filter.</p>
     <p>If the msg property <code>invalid</code> is present in the message, all nodes ignore the message.</p>
 
     <h3>Input</h3>
@@ -103,8 +104,6 @@
         <dd> name of the input channel.</dd>
         <dt>payload <span class="property-type">number</span></dt>
         <dd> input value for <code>topic</code>.</dd>
-        <dt>control <span class="property-type">number</span></dt>
-        <dd> control value, THe message property can be selected  with the <code>Control</code> property.</dd>
     </dl>
     
     <h3>Output</h3>

package/math_lowpass.js

@@ -16,8 +16,8 @@ module.exports = function(RED) {
         this.zeroIsZero     = Boolean( config.zeroIsZero );
         this.round          = config.decimals ? Math.pow( 10, Number( config.decimals ) ) : null;
         this.showState      = Boolean( config.showState );
-        this.data       = {};
-        this.last       = {};
+        this.data = {};
+        this.last = {};
         if( this.propertyType === "jsonata" )
         {
             try {
@@ -41,14 +41,12 @@ module.exports = function(RED) {
         node.on('input', function(msg,send,done) {
             if( msg.invalid )
             {
-                done();
             }
             else if( msg.reset || msg.topic==="init" )
             {
                 node.data = {};
                 node.last = {};
                 node.status( "" );
-                done();
             }
             else
             {
@@ -79,59 +77,39 @@ module.exports = function(RED) {
                     {
                         msg.topic = node.topic;
                     }
-                    const payload = Number( value );
-                    if( ! isNaN( payload ) )
+                    const measurement = Number( value );
+                    if( ! isNaN( measurement ) )
                     {
-                            node.data[msg.topic] ??= {};
-                            const data = node.data[msg.topic];
-                            const now  = Date.now();
-
-                            function lowPassFilter(measurement)
-                            {
-                                if( data.last == undefined )
-                                {
-                                    data.last =  measurement;
-                                }
-                                else
-                                {
-                                    data.last += node.alpha * ( measurement - data.last );
-                                }
-                                return data.last;
-                            }
+                        // Alpha-Filter
+                        if( node.data[msg.topic] === undefined || ( node.zeroIsZero && measurement === 0 ) )
+                        {
+                            node.data[msg.topic] = measurement;
+                        }
+                        else
+                        {
+                            node.data[msg.topic] += node.alpha * ( measurement - node.data[msg.topic] );
+                        }
 
-                            function sendValue(value)
-                            {
-                                msg.payload = value;
-                                node.last[msg.topic] = {value:value,time:now};
-                                setStatus( "green", tools.formatNumber(value) );
-                                send( msg );
-                            }
+                        // Round
+                        msg.payload = node.round ? Math.round( node.data[msg.topic] * node.round ) / node.round : node.data[msg.topic];
 
-                            if( node.zeroIsZero && payload === 0 )
-                            {
-                                data.estimate = 0;
-                                sendValue( 0 );
-                            }
-                            else
-                            {
-                                let   value = lowPassFilter( payload );
-                                const help  = node.last[msg.topic];
-                                if( help === undefined ||
-                                    ( help.time + node.filterTime < now && tools.distance( help.value, value ) >= node.filterValue ) ||
-                                    ( node.filterLongTime > 0 && help.time + node.filterLongTime < now  ) )
-                                {
-                                    if( node.round )
-                                    {
-                                        value = Math.round( value * node.round ) / node.round;
-                                    }
-                                    sendValue( value );
-                                }
-                                else
-                                {
-                                    setStatus( "gray", tools.formatNumber(value) );
-                                }
-                            }
-                            context.set( "data", node.data, node.contextStore );
+                        // Send-Filter
+                        const now  = Date.now();
+                        const help = node.last[msg.topic];
+                        let   color;
+                        if( help === undefined ||
+                            ( help.time + node.filterTime < now && tools.distance( help.value, node.data[msg.topic] ) >= node.filterValue ) ||
+                            ( node.filterLongTime > 0 && help.time + node.filterLongTime < now  ) )
+                        {
+                            node.last[msg.topic] = { value:msg.payload, time:now };
+                            send( msg );
+                            color = "green";
+                        }
+                        else
+                        {
+                            color = "gray";
+                        }
+                        setStatus( color, tools.formatNumber(msg.payload) );
                     }
                     else
                     {
@@ -141,9 +119,9 @@ module.exports = function(RED) {
                             node.warn( `payload is NaN (${msg.topic}=${value})` );
                         }
                     }
-                    done();
                 } );
             }
+            done();
         });
     }
 

package/math_mean.html

@@ -67,7 +67,7 @@
     </div>
     <div class="form-row">
        <label for="node-input-minMean"><i class="fa fa-hourglass-o"></i> Zeitspanne</label>
-       <input type="text" id="node-input-deltaTime" style="width:70px;" placeholder="Time">
+       <input type="number" id="node-input-deltaTime" style="width:70px;" placeholder="Time">
         <select id="node-input-deltaUnit" style="width:140px;">
             <option value="msecs">MilliSeconds</option>
             <option value="secs">Seconds</option>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mschaeffler/node-red-logic",
-  "version": "4.3.3",
+  "version": "4.4.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",
@@ -41,6 +41,6 @@
     "url": "https://github.com/m-schaeffler"
   },
   "scripts": {
-    "test": "mocha \"test/math_lowpass_spec.js\""
+    "test": "mocha \"test/*_spec.js\""
   }
 }