@mschaeffler/node-red-logic 3.8.0 → 3.10.0

package/logic_timerelay.js

@@ -24,7 +24,7 @@ module.exports = function(RED) {
 
         function setStatus(color,text)
         {
-            console.log( text );
+            //console.log( text );
             if( node.showState )
             {
                 node.status( { text:text, shape:"dot", fill:color } );
@@ -127,7 +127,7 @@ module.exports = function(RED) {
             }
             else
             {
-                console.log("error")
+                //console.log("error")
                 setStatus( "red", "error" );
             }
             done();

package/math_mean.html

@@ -4,6 +4,7 @@
         color: "#C0DEED",
         defaults: {
             name:{value:""},
+            topic:{value:""},
             property:{value:"payload", required:true},
             propertyType:{value:"msg"},
             deltaTime:{value:"60", required:true, validate:function(v){
@@ -16,6 +17,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,
@@ -44,6 +46,10 @@
         <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-topic"><i class="fa fa-envelope-o"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="Topic">
+    </div>
     <div class="form-row">
         <label for="node-input-input"><i class="fa fa-ellipsis-h"></i> Eigenschaft</label>
         <input type="text" id="node-input-property">
@@ -54,21 +60,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;">
@@ -106,6 +116,8 @@
     <h3>Parameter</h3>
 
     <dl class="message-properties">
+        <dt>Topic <span class="property-type">string</span></dt>
+        <dd> defines the topic for the output message, "" is <code>msg.topic</code>.</dd>
         <dt>Property <span class="property-type">string</span></dt>
         <dd> defines the message property to be used as payload.</dd>
         <dt>Delta time <span class="property-type">number</span></dt>
@@ -118,6 +130,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

@@ -6,6 +6,7 @@ module.exports = function(RED) {
         //this.config = config;
         var node      = this;
         var context   = this.context();
+        this.topic        = config.topic || "";
         this.property     = config.property || "payload";
         this.propertyType = config.propertyType ?? "msg";
         this.deltaTime    = Number( config.deltaTime ?? 60 )*1000;
@@ -14,6 +15,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" )
         {
@@ -89,6 +91,10 @@ module.exports = function(RED) {
 
                         function sendValue(value,count)
                         {
+                            if( node.topic )
+                            {
+                                msg.topic = node.topic;
+                            }
                             msg.payload = value;
                             msg.count   = count;
                             last[msg.topic] = {value:value,time:now};
@@ -109,11 +115,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.8.0",
+  "version": "3.10.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",