@mschaeffler/node-red-logic 3.0.0 → 3.0.1
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 +2 -2
- package/logic_and.js +13 -2
- package/logic_or.html +2 -2
- package/logic_or.js +13 -2
- package/package.json +1 -1
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)
|
|
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
|
|
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.
|
|
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
|
-
|
|
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)
|
|
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
|
|
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.
|
|
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
|
-
|
|
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 )
|
package/package.json
CHANGED