@mschaeffler/node-red-logic 0.0.4 → 0.0.5

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.
Files changed (7) hide show
  1. package/logic_and.html +6 -1
  2. package/logic_and.js +13 -3
  3. package/logic_or.html +6 -1
  4. package/logic_or.js +13 -3
  5. package/math_plus.html +6 -1
  6. package/math_plus.js +13 -2
  7. package/package.json +1 -1
package/logic_and.html CHANGED
@@ -4,7 +4,8 @@
4
4
  color: "#C0DEED",
5
5
  defaults: {
6
6
  name:{value:""},
7
- property:{value:"payload",required:true}
7
+ property:{value:"payload",required:true},
8
+ minData:{value:"1",validate:RED.validators.number(),required:true}
8
9
  },
9
10
  inputs:1,
10
11
  outputs:1,
@@ -34,6 +35,10 @@
34
35
  <input type="text" id="node-input-property">
35
36
  <input type="hidden" id="node-input-property-type">
36
37
  </div>
38
+ <div class="form-row">
39
+ <label for="node-input-minData"><i class="fa fa-tag"></i> min. Data</label>
40
+ <input type="text" id="node-input-minData">
41
+ </div>
37
42
  </script>
38
43
 
39
44
  <script type="text/html" data-help-name="and">
package/logic_and.js CHANGED
@@ -7,6 +7,7 @@ module.exports = function(RED) {
7
7
  var node = this;
8
8
  var context = this.context();
9
9
  this.property = config.property || "payload";
10
+ this.minData = Number( config.minData );
10
11
 
11
12
  node.on('input', function(msg,send,done) {
12
13
  const payload = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
@@ -16,17 +17,26 @@ module.exports = function(RED) {
16
17
  context.set( "data", data );
17
18
 
18
19
  msg.payload = true;
20
+ let count = 0;
19
21
  for( const item in data )
20
22
  {
23
+ count++;
21
24
  if( ! data[item] )
22
25
  {
23
26
  msg.payload = false;
24
- break;
25
27
  }
26
28
  }
27
29
 
28
- node.status( msg.payload );
29
- send( msg );
30
+ if( count >= node.minData )
31
+ {
32
+ node.status( msg.payload );
33
+ send( msg );
34
+ }
35
+ else
36
+ {
37
+ node.status( "waiting for data" );
38
+ }
39
+
30
40
  done();
31
41
  });
32
42
  }
package/logic_or.html CHANGED
@@ -4,7 +4,8 @@
4
4
  color: "#C0DEED",
5
5
  defaults: {
6
6
  name:{value:""},
7
- property:{value:"payload",required:true}
7
+ property:{value:"payload",required:true},
8
+ minData:{value:"1",validate:RED.validators.number(),required:true}
8
9
  },
9
10
  inputs:1,
10
11
  outputs:1,
@@ -34,6 +35,10 @@
34
35
  <input type="text" id="node-input-property">
35
36
  <input type="hidden" id="node-input-property-type">
36
37
  </div>
38
+ <div class="form-row">
39
+ <label for="node-input-minData"><i class="fa fa-tag"></i> min. Data</label>
40
+ <input type="text" id="node-input-minData">
41
+ </div>
37
42
  </script>
38
43
 
39
44
  <script type="text/html" data-help-name="or">
package/logic_or.js CHANGED
@@ -7,6 +7,7 @@ module.exports = function(RED) {
7
7
  var node = this;
8
8
  var context = this.context();
9
9
  this.property = config.property || "payload";
10
+ this.minData = Number( config.minData );
10
11
 
11
12
  node.on('input', function(msg,send,done) {
12
13
  const payload = tools.property2boolean( RED.util.getMessageProperty( msg, node.property ) );
@@ -16,17 +17,26 @@ module.exports = function(RED) {
16
17
  context.set( "data", data );
17
18
 
18
19
  msg.payload = false;
20
+ let count = 0;
19
21
  for( const item in data )
20
22
  {
23
+ count++;
21
24
  if( data[item] )
22
25
  {
23
26
  msg.payload = true;
24
- break;
25
27
  }
26
28
  }
27
29
 
28
- node.status( msg.payload );
29
- send( msg );
30
+ if( count >= node.minData )
31
+ {
32
+ node.status( msg.payload );
33
+ send( msg );
34
+ }
35
+ else
36
+ {
37
+ node.status( "waiting for data" );
38
+ }
39
+
30
40
  done();
31
41
  });
32
42
  }
package/math_plus.html CHANGED
@@ -4,7 +4,8 @@
4
4
  color: "#C0DEED",
5
5
  defaults: {
6
6
  name:{value:""},
7
- property:{value:"payload",required:true}
7
+ property:{value:"payload",required:true},
8
+ minData:{value:"1",validate:RED.validators.number(),required:true}
8
9
  },
9
10
  inputs:1,
10
11
  outputs:1,
@@ -34,6 +35,10 @@
34
35
  <input type="text" id="node-input-property">
35
36
  <input type="hidden" id="node-input-property-type">
36
37
  </div>
38
+ <div class="form-row">
39
+ <label for="node-input-minData"><i class="fa fa-tag"></i> min. Data</label>
40
+ <input type="text" id="node-input-minData">
41
+ </div>
37
42
  </script>
38
43
 
39
44
  <script type="text/html" data-help-name="plus">
package/math_plus.js CHANGED
@@ -6,6 +6,7 @@ module.exports = function(RED) {
6
6
  var node = this;
7
7
  var context = this.context();
8
8
  this.property = config.property || "payload";
9
+ this.minData = Number( config.minData );
9
10
 
10
11
  node.on('input', function(msg,send,done) {
11
12
  const payload = Number( RED.util.getMessageProperty( msg, node.property ) );
@@ -15,13 +16,23 @@ module.exports = function(RED) {
15
16
  context.set( "data", data );
16
17
 
17
18
  msg.payload = 0;
19
+ let count = 0;
18
20
  for( const item in data )
19
21
  {
22
+ count++;
20
23
  msg.payload += data[item];
21
24
  }
22
25
 
23
- node.status( msg.payload );
24
- send( msg );
26
+ if( count >= node.minData )
27
+ {
28
+ node.status( msg.payload );
29
+ send( msg );
30
+ }
31
+ else
32
+ {
33
+ node.status( "waiting for data" );
34
+ }
35
+
25
36
  done();
26
37
  });
27
38
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mschaeffler/node-red-logic",
3
- "version": "0.0.4",
3
+ "version": "0.0.5",
4
4
  "description": "nodes for simple mathematical operations.",
5
5
  "license": "LGPL-2.1",
6
6
  "homepage": "https://github.com/m-schaeffler/node-red-my-nodes/tree/main/node-red-logic",