@mschaeffler/node-red-logic 3.7.0 → 3.9.0

package/logic_timerelay.html

@@ -0,0 +1,148 @@
+<script type="text/javascript">
+    RED.nodes.registerType('timerelay',{
+        category: 'logic',
+        color: "#C0DEED",
+        defaults: {
+            name:{value:""},
+            property:{value:"payload",required:true},
+            delay:{value:"0",required:true},
+            minOn:{value:"0",required:true},
+            maxOn:{value:"0",required:true},
+            postrun:{value:"0",required:true},
+            outputOn:{value:true,required:true},
+            outputOnType:{value:"bool"},
+            outputOff:{value:false,required:true},
+            outputOffType:{value:"bool"},
+            showState:{value:false}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "font-awesome/fa-clock-o",
+        label: function() {
+            return this.name||"timerelay";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        paletteLabel: "timerelay",
+        inputLabels: 'input',
+        outputLabels: 'boolean',
+        oneditprepare: function() {
+            $("#node-input-property").typedInput({
+                type:"msg",
+                types:["msg"],
+                typeField: "#node-input-property-type"
+            })
+            $("#node-input-outputOn").typedInput({
+                type:"bool",
+                types:["str","num","bool","json"],
+                typeField: "#node-input-outputOnType"
+            })
+            $("#node-input-outputOff").typedInput({
+                type:"bool",
+                types:["str","num","bool","json"],
+                typeField: "#node-input-outputOffType"
+            })
+        }
+    });
+</script>
+
+<script type="text/html" data-template-name="timerelay">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> Eigenschaft</label>
+        <input type="text" id="node-input-property">
+        <input type="hidden" id="node-input-property-type">
+    </div>
+    <div class="form-row">
+        <label for="node-input-delay"><i class="fa fa-play"></i> Delay</label>
+        <input type="text" id="node-input-delay">
+    </div>
+    <div class="form-row">
+        <label for="node-input-postrun"><i class="fa fa-stop"></i> Postrun</label>
+        <input type="text" id="node-input-postrun">
+    </div>
+    <div class="form-row">
+        <label for="node-input-minOn"><i class="fa fa-hourglass-start"></i> min on time</label>
+        <input type="text" id="node-input-minOn">
+    </div>
+    <div class="form-row">
+        <label for="node-input-maxOn"><i class="fa fa-hourglass-end"></i> max on time</label>
+        <input type="text" id="node-input-maxOn">
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputOn"><i class="fa fa-sign-out"></i> on Output</label>
+        <input type="text" id="node-input-outputOn">
+        <input type="hidden" id="node-input-outputOnType">
+    </div>
+    <div class="form-row">
+        <label for="node-input-outputOff"><i class="fa fa-sign-out"></i> off Output</label>
+        <input type="text" id="node-input-outputOff">
+        <input type="hidden" id="node-input-outputOffType">
+    </div>
+    <div class="form-row">
+        <label for="node-input-howStatus"><i class="fa fa-star-o"></i> Status</label>
+        <input type="checkbox" id="node-input-showState" style="display:inline-block; width:20px; vertical-align:baseline;">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="timerelay">
+    
+    <p>Sends the payload converted to boolean delayed. The delay time can de controlled for on and off switching individually.</p>
+    <p>If the msg property <code>invalid</code> is present in the message, all nodes ignore the message.</p>
+    
+    <table>
+      <tr> <th>type</th> <th>input</th> <th>output</th> </tr>
+      <tr> <td>boolean</td> <td>false</td> <td>false</td> </tr>
+      <tr> <td></td> <td>true</td> <td>true</td> </tr>
+      <tr> <td>number</td> <td>0</td> <td>false</td> </tr>
+      <tr> <td></td> <td>1</td> <td>true</td> </tr>
+      <tr> <td>string</td> <td>false</td> <td>false</td> </tr>
+      <tr> <td></td> <td>true</td> <td>true</td> </tr>
+      <tr> <td></td> <td>0</td> <td>false</td> </tr>
+      <tr> <td></td> <td>1</td> <td>true</td> </tr>
+      <tr> <td></td> <td>off</td> <td>false</td> </tr>
+      <tr> <td></td> <td>on</td> <td>true</td> </tr>
+    </table> 
+
+    <h3>Input</h3>
+    
+    <p>The message property to be used as payload can be defined with the <code>Property</code> property.</p>
+    
+    <dl class="message-properties">
+        <dt>payload <span class="property-type"></span></dt>
+        <dd> input value.</dd>
+    </dl>
+    
+    <h3>Output</h3>
+    
+    <dl class="message-properties">
+        <dt>payload <span class="property-type">boolean</span></dt>
+        <dd> bool value of payload.</dd>
+    </dl>
+    
+    <h3>Parameter</h3>
+
+    <dl class="message-properties">
+        <dt>Property <span class="property-type">string</span></dt>
+        <dd> defines the message property to be used as payload.</dd>
+        <dt>Delay <span class="property-type">number</span></dt>
+        <dd> delay time in msec for switching from on to off.</dd>
+        <dt>Postrun <span class="property-type">number</span></dt>
+        <dd> delay time in msec for switching from off to on.</dd>
+        <dt>min on time <span class="property-type">number</span></dt>
+        <dd> minimal time in msec to be in on state.</dd>
+        <dt>max on time <span class="property-type">number</span></dt>
+        <dd> maximal time in msec to be in on state; 0 is infinite.</dd>
+        <dt>on Output <span class="property-type">multi</span></dt>
+        <dd> Value to be sent in on case.</dd>
+        <dt>off Output <span class="property-type">multi</span></dt>
+        <dd> Value to be sent in off case.</dd>
+        <dt>Status <span class="property-type">boolean</span></dt>
+        <dd> shows the actual value as a node status.</dd>
+    </dl>
+    
+</script>

package/logic_timerelay.js

@@ -0,0 +1,174 @@
+module.exports = function(RED) {
+    var tools = require('./tools.js');
+
+    function TimeRelayNode(config) {
+        RED.nodes.createNode(this,config);
+        //this.config = config;
+        var node = this;
+        this.property  = config.property || "payload";
+        this.delay     = Number( config.delay ?? 0 );
+        this.postrun   = Number( config.postrun ?? 0 );
+        this.minOn     = Number( config.minOn ?? 0 );
+        this.maxOn     = Number( config.maxOn ?? 0 );
+        this.outputOn  = tools.convertTypedInput( config.outputOn  ?? "true", config.outputOnType  ?? "bool" );
+        this.outputOff = tools.convertTypedInput( config.outputOff ?? "false",config.outputOffType ?? "bool" );
+        this.showState = Boolean( config.showState );
+        this.state        = null;
+        this.last         = null;
+        this.msg          = null;
+        this.timerDelay   = null;
+        this.timerPostRun = null;
+        this.timerMinOn   = null;
+        this.timerMaxOn   = null;
+        node.status( "" );
+
+        function setStatus(color,text)
+        {
+            //console.log( text );
+            if( node.showState )
+            {
+                node.status( { text:text, shape:"dot", fill:color } );
+            }
+        }
+
+        function doswitch()
+        {
+            node.msg.payload = node.state ? node.outputOn : node.outputOff;
+            node.send( node.msg );
+            if( node.state )
+            {
+                if( node.minOn )
+                {
+                    node.timerMinOn = setTimeout( function() { node.emit("minOn"); }, node.minOn );
+                }
+                if( node.maxOn )
+                {
+                    node.timerMaxOn = setTimeout( function() { node.emit("maxOn"); }, node.maxOn );
+                }
+            }
+            else
+            {
+                clearTimeout( node.timerMinOn );
+                clearTimeout( node.timerMaxOn );
+                node.timerMinOn = null;
+                node.timerMaxOn = null;
+                node.msg        = null;
+            }
+        }
+
+        node.on('input', function(msg,send,done) {
+            if( msg.invalid )
+            {
+                done();
+                return;
+            }
+            node.state = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
+            if( node.state !== null )
+            {
+                if( node.state !== node.last )
+                {
+                    node.last = node.state;
+                    node.msg  = msg;
+                    if( node.state )
+                    {
+                        if( node.timerPostrun )
+                        {
+                            clearTimeout( node.timerPostrun );
+                            node.timerPostrun = null;
+                            doswitch();
+                            setStatus( "green", "on (change of mind)" );
+                        }
+                        else
+                        {
+                            if( node.delay > 0 )
+                            {
+                                node.timerDelay = setTimeout( function() { node.emit("sendOnMsg"); }, node.delay );
+                                setStatus( "yellow", "startdelay" );
+                            }
+                            else
+                            {
+                                doswitch();
+                                setStatus( "green", "on" );
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if( node.timerDelay )
+                        {
+                            clearTimeout( node.timerDelay );
+                            node.timerDelay = null;
+                            doswitch();
+                            setStatus( "gray", "off (change of mind)" );
+                        }
+                        else
+                        {
+                            if( node.postrun > 0 )
+                            {
+                                node.timerPostrun = setTimeout( function() { node.emit("sendOffMsg"); }, node.postrun );
+                                setStatus( "yellow", "postrun" );
+                            }
+                            else if( node.timerMinOn )
+                            {
+                                setStatus( "yellow", "minimal on" );
+                            }
+                            else
+                            {
+                                doswitch();
+                                setStatus( "gray", "off" );
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    setStatus( node.state ? "green" : "gray", "filter" );
+                }
+            }
+            else
+            {
+                //console.log("error")
+                setStatus( "red", "error" );
+            }
+            done();
+        });
+
+        node.on('sendOnMsg', function() {
+            node.timerDelay = null;
+            doswitch();
+            setStatus( "green", "on" );
+        });
+
+        node.on('sendOffMsg', function() {
+            node.timerPostrun = null;
+            doswitch();
+            setStatus( "gray", "off" );
+        });
+
+        node.on('minOn', function() {
+            node.timerMinOn = null;
+            if( ! node.state )
+            {
+                doswitch();
+                setStatus( "gray", "off (min time)" );
+            }
+        });
+
+        node.on('maxOn', function() {
+            node.timerMaxOn = null;
+            node.last       = false;
+            node.state      = false;
+            doswitch();
+            setStatus( "gray", "off (max time)" );
+        });
+
+        node.on('close', function() {
+            clearTimeout( node.timerDelay );
+            clearTimeout( node.timerPostrun );
+            clearTimeout( node.timerMinOn );
+            clearTimeout( node.timerMaxOn );
+        });
+    }
+
+    RED.nodes.registerType("timerelay",TimeRelayNode);
+}

package/math_mean.html

@@ -16,6 +16,7 @@
             filterVal:{value:0, validate:RED.validators.number()},
             filterMul:{value:10, validate:RED.validators.number()},
             zeroIsZero:{value:false},
+            decimals:{validate:RED.validators.number()},
             showState:{value:false}
         },
         inputs:1,
@@ -54,21 +55,25 @@
        <input type="text" id="node-input-deltaTime">
     </div>
     <div class="form-row">
-        <label for="node-input-minData"><i class="fa fa-check-square-o "></i> min. Data</label>
+        <label for="node-input-minData"><i class="fa fa-check-square-o"></i> min. Data</label>
         <input type="text" id="node-input-minData">
     </div>
     <div class="form-row">
-        <label for="node-input-filter"><i class="fa fa-filter "></i> Filterzeit</label>
+        <label for="node-input-filter"><i class="fa fa-filter"></i> Filterzeit</label>
         <input type="number" id="node-input-filter">
     </div>
     <div class="form-row">
-        <label for="node-input-filterVal"><i class="fa fa-filter "></i> Filter Wert</label>
+        <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>
+        <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-decimals"><i class="fa fa-sort-numeric-asc"></i> Nachkommastellen</label>
+        <input type="text" id="node-input-decimals">
+    </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;">
@@ -118,6 +123,8 @@
         <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>Nachkommastellen <span class="property-type">number</span></dt>
+        <dd> Anzahl an Nachkommastellen..</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

@@ -14,6 +14,7 @@ module.exports = function(RED) {
         this.filterValue  = Number( config.filterVal ?? 0 );
         this.filterLongTime = this.filterTime * Number( config.filterMul ?? 10 );
         this.zeroIsZero   = Boolean( config.zeroIsZero );
+        this.round        = config.decimals ? Math.pow( 10, Number( config.decimals ) ) : null;
         this.showState    = Boolean( config.showState );
         if( this.propertyType === "jsonata" )
         {
@@ -109,11 +110,15 @@ module.exports = function(RED) {
                                 sum += value.value;
                             }
                             const help  = last[msg.topic];
-                            const value = sum/item.length;
+                            let   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  ) )
                             {
+                                if( node.round )
+                                {
+                                    value = Math.round( value * node.round ) / node.round;
+                                }
                                 sendValue( value, item.length );
                             }
                             else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mschaeffler/node-red-logic",
-  "version": "3.7.0",
+  "version": "3.9.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",
@@ -22,6 +22,7 @@
       "not": "logic_not.js",
       "or": "logic_or.js",
       "and": "logic_and.js",
+      "timerelay": "logic_timerelay.js",
       "tonumber": "math_number.js",
       "negate": "math_minus.js",
       "reduce": "math_reduce.js",