@mschaeffler/node-red-logic 3.13.0 → 4.0.0

package/logic_bool.html

@@ -4,6 +4,7 @@
         color: "#C0DEED",
         defaults: {
             name:{value:""},
+            topic:{value:""},
             property:{value:"payload",required:true},
             showState:{value:false},
             filter:{value:false}
@@ -12,7 +13,7 @@
         outputs:1,
         icon: "font-awesome/fa-check-square-o",
         label: function() {
-            return this.name||"to bool";
+            return this.name||this.topic||"to bool";
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
@@ -35,6 +36,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">
@@ -88,6 +93,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.</dd>
         <dt>Property <span class="property-type">string</span></dt>
         <dd> defines the message property to be used as payload.</dd>
         <dt>Status <span class="property-type">boolean</span></dt>

package/logic_bool.js

@@ -5,6 +5,7 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,config);
         //this.config = config;
         var node = this;
+        this.topic     = config.topic ?? "";
         this.property  = config.property || "payload";
         this.showState = Boolean( config.showState );
         this.filter    = Boolean( config.filter );
@@ -21,6 +22,10 @@ module.exports = function(RED) {
             let status = { text:msg.payload ?? "error" };
             if( msg.payload !== null )
             {
+                if( node.topic )
+                {
+                    msg.topic = node.topic;
+                }
                 if( node.filter )
                 {
                     status.shape = "dot";

package/math_hysteresis.html

@@ -12,8 +12,6 @@
                 const raise = $("#node-input-threshold_raise").length ? $("#node-input-threshold_raise").val() : this.threshold_raise;
                 return v!=='' && !isNaN(v) && Number(v)<raise;}
             },
-            consecutive:{value:1,required:true,validate:RED.validators.number()},
-            consecutiveFall:{value:1,required:true,validate:RED.validators.number()},
             outputRise:{value:true,required:true},
             outputRiseType:{value:"bool"},
             outputFall:{value:false,required:true},
@@ -75,14 +73,6 @@
         <label for="node-input-threshold_fall"><i class="fa fa-chevron-down"></i> dn threshold</label>
         <input type="text" id="node-input-threshold_fall">
     </div>
-    <div class="form-row">
-        <label for="node-input-consecutive"><i class="fa fa-line-chart"></i> rise Consecutive</label>
-        <input type="number" id="node-input-consecutive">
-    </div>
-    <div class="form-row">
-        <label for="node-input-consecutiveFall"><i class="fa fa-line-chart"></i> fall Consecutive</label>
-        <input type="number" id="node-input-consecutiveFall">
-    </div>
     <div class="form-row">
         <label for="node-input-outputRise"><i class="fa fa-sign-out"></i> rise Output</label>
         <input type="text" id="node-input-outputRise">
@@ -150,10 +140,6 @@
         <dd> threshold value for the rising edge detection.</dd>
         <dt>d(ow)n Threshold <span class="property-type">number</span></dt>
         <dd> threshold value for the falling edge detection.</dd>
-        <dt>rise Consecutive <span class="property-type">number</span></dt>
-        <dd> number of consecutive frames to generate a rising output.</dd>
-        <dt>fall Consecutive <span class="property-type">number</span></dt>
-        <dd> number of consecutive frames to generate a falling output.</dd>
         <dt>rise Output <span class="property-type">multi</span></dt>
         <dd> Value to be sent in case of a rising edge.</dd>
         <dt>fall Output <span class="property-type">multi</span></dt>

package/math_hysteresis.js

@@ -11,8 +11,6 @@ module.exports = function(RED) {
         this.propertyType   = config.propertyType ?? "msg";
         this.threshold_rise = Number( config.threshold_raise );
         this.threshold_fall = Number( config.threshold_fall );
-        this.consecutiveRise= Number( config.consecutive ?? 1 );
-        this.consecutiveFall= Number( config.consecutiveFall ?? 1 );
         this.outputRise     = RED.util.evaluateNodeProperty( config.outputRise ?? "true", config.outputRiseType ?? "bool" );
         this.outputFall     = RED.util.evaluateNodeProperty( config.outputFall ?? "false",config.outputFallType ?? "bool" );
         this.noInit         = Boolean( config.noInit );
@@ -27,8 +25,6 @@ module.exports = function(RED) {
                 return;
             }
         }
-        node.cntRise = 0;
-        node.cntFall = 0;
         node.status( "" );
 
         function msgSetEdge(msg,edge)
@@ -110,34 +106,11 @@ module.exports = function(RED) {
 
                         if( msg.value > node.threshold_rise && last !== true )
                         {
-                            if( ++node.cntRise >= node.consecutiveRise )
-                            {
-                                sendMsg( true );
-                                node.cntRise = 0;
-                            }
-                            else
-                            {
-                                status.fill = "gray";
-                            }
-                            node.cntFall = 0;
+                            sendMsg( true );
                         }
                         else if( msg.value < node.threshold_fall && last !== false )
                         {
-                            if( ++node.cntFall >= node.consecutiveFall )
-                            {
-                                sendMsg( false );
-                                node.cntFall = 0;
-                            }
-                            else
-                            {
-                                status.fill = "gray";
-                            }
-                            node.cntRise = 0;
-                        }
-                        else
-                        {
-                            node.cntRise = 0;
-                            node.cntFall = 0;
+                            sendMsg( false );
                         }
                     }
                     else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mschaeffler/node-red-logic",
-  "version": "3.13.0",
+  "version": "4.0.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",