@mschaeffler/node-red-logic 3.0.0 → 3.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/logic_and.html CHANGED
@@ -7,7 +7,7 @@
7
7
  topic:{value:""},
8
8
  property:{value:"payload", required:true},
9
9
  minData:{value:"1", required:true, validate:function(v){
10
- return v!=='' && !isNaN(v) && Number(v)>0;
10
+ return v!=='' && !isNaN(v) && Number(v)>=0;
11
11
  }},
12
12
  filter:{value:false}
13
13
  },
@@ -91,7 +91,7 @@
91
91
  <dt>Property <span class="property-type">string</span></dt>
92
92
  <dd> defines the message property to be used as payload.</dd>
93
93
  <dt>min. Data <span class="property-type">number</span></dt>
94
- <dd> min. amount of topics to generate an output.</dd>
94
+ <dd> min. amount of topics to generate an output. If set to 0, the <code>reset</code> command also generates a <code>false</code> output payload</dd>
95
95
  <dt>Filter <span class="property-type">boolean</span></dt>
96
96
  <dd> block sending of unchanged <code>property</code>.</dd>
97
97
  </dl>
package/logic_and.js CHANGED
@@ -20,7 +20,15 @@ module.exports = function(RED) {
20
20
  else if( msg.reset || msg.topic==="init" )
21
21
  {
22
22
  context.set( "data", {} );
23
- node.status( "" );
23
+ if( node.minData === 0 )
24
+ {
25
+ send( { topic:node.topic||"init", payload:false, count:0 } );
26
+ node.status( false );
27
+ }
28
+ else
29
+ {
30
+ node.status( "" );
31
+ }
24
32
  done();
25
33
  }
26
34
  else
@@ -33,7 +41,10 @@ module.exports = function(RED) {
33
41
  data[msg.topic] = payload;
34
42
  context.set( "data", data );
35
43
 
36
- msg.topic = node.topic;
44
+ if( node.topic )
45
+ {
46
+ msg.topic = node.topic;
47
+ }
37
48
  msg.payload = true;
38
49
  msg.count = 0;
39
50
  for( const item in data )
package/logic_or.html CHANGED
@@ -7,7 +7,7 @@
7
7
  topic:{value:""},
8
8
  property:{value:"payload", required:true},
9
9
  minData:{value:"1", required:true, validate:function(v){
10
- return v!=='' && !isNaN(v) && Number(v)>0;
10
+ return v!=='' && !isNaN(v) && Number(v)>=0;
11
11
  }},
12
12
  filter:{value:false}
13
13
  },
@@ -91,7 +91,7 @@
91
91
  <dt>Property <span class="property-type">string</span></dt>
92
92
  <dd> defines the message property to be used as payload.</dd>
93
93
  <dt>min. Data <span class="property-type">number</span></dt>
94
- <dd> min. amount of topics to generate an output.</dd>
94
+ <dd> min. amount of topics to generate an output. If set to 0, the <code>reset</code> command also generates a <code>false</code> output payload</dd>
95
95
  <dt>Filter <span class="property-type">boolean</span></dt>
96
96
  <dd> block sending of unchanged <code>property</code>.</dd>
97
97
  </dl>
package/logic_or.js CHANGED
@@ -20,7 +20,15 @@ module.exports = function(RED) {
20
20
  else if( msg.reset || msg.topic==="init" )
21
21
  {
22
22
  context.set( "data", {} );
23
- node.status( "" );
23
+ if( node.minData === 0 )
24
+ {
25
+ send( { topic:node.topic||"init", payload:false, count:0 } );
26
+ node.status( false );
27
+ }
28
+ else
29
+ {
30
+ node.status( "" );
31
+ }
24
32
  done();
25
33
  }
26
34
  else
@@ -33,7 +41,10 @@ module.exports = function(RED) {
33
41
  data[msg.topic] = payload;
34
42
  context.set( "data", data );
35
43
 
36
- msg.topic = node.topic;
44
+ if( node.topic )
45
+ {
46
+ msg.topic = node.topic;
47
+ }
37
48
  msg.payload = false;
38
49
  msg.count = 0;
39
50
  for( const item in data )
@@ -108,6 +108,19 @@
108
108
  <h3>Output</h3>
109
109
 
110
110
  <p>Trigger message, in case an edge is detected.</p>
111
+
112
+ <dl class="message-properties">
113
+ <dt>topic <span class="property-type">string</span></dt>
114
+ <dd> name of the input channel.</dd>
115
+ <dt>payload <span class="property-type"></span></dt>
116
+ <dd> output value defines in <code>rise Output</code> or <code>fall Output</code>.</dd>
117
+ <dt>value <span class="property-type">number</span></dt>
118
+ <dd> last input value for <code>topic</code>.</dd>
119
+ <dt>edge <span class="property-type">string</span></dt>
120
+ <dd> <code>"rising"</code> or <code>"falling"</code> according to detected edge.</dd>
121
+ <dt>init <span class="property-type">boolean</span></dt>
122
+ <dd> <code>true</code> in case of an initialization message without really an edge detection.</dd>
123
+ </dl>
111
124
 
112
125
  <h3>Parameter</h3>
113
126
 
@@ -79,6 +79,7 @@ module.exports = function(RED) {
79
79
  context.set( "data", data );
80
80
  msg.payload = edge ? node.outputRise : node.outputFall;
81
81
  msg.edge = edge ? "rising" : 'falling';
82
+ msg.init = last === undefined;
82
83
  send( msg );
83
84
  }
84
85
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mschaeffler/node-red-logic",
3
- "version": "3.0.0",
3
+ "version": "3.0.4",
4
4
  "description": "nodes for simple operations.",
5
5
  "license": "LGPL-2.1",
6
6
  "homepage": "https://github.com/m-schaeffler/node-red-my-nodes/tree/main/node-red-logic",