frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2023-10-10 13:36:58 +02:00
Code Issues Releases Wiki Activity

Fix RBE greater than change not emitting on first message

Browse Source 
And fix missing close tags
This commit is contained in:
Dave Conway-Jones 2020-05-31 21:52:37 +01:00
parent 01d675b372
commit cd85fe8df2
No known key found for this signature in database
GPG Key ID: 302A6725C594817F
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
function/rbe/package.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "node-red-node-rbe", "name" : "node-red-node-rbe",
"version" : "0.2.8", "version" : "0.2.9",
"description" : "A Node-RED node that provides report-by-exception (RBE) and deadband capabilities.", "description" : "A Node-RED node that provides report-by-exception (RBE) and deadband capabilities.",
"dependencies" : { "dependencies" : {
}, },

4
function/rbe/rbe.html
View File

@ -20,7 +20,7 @@
</select> </select>
</div> </div>
<div class="form-row" id="node-startvalue"> <div class="form-row" id="node-startvalue">
<label for="node-input-start"><i class="fa fa-thumb-tack"/> <span data-i18n="rbe.label.start"></span></label> <label for="node-input-start"><i class="fa fa-thumb-tack"></i> <span data-i18n="rbe.label.start"></span></label>
<input type="text" id="node-input-start" data-i18n="[placeholder]rbe.placeholder.start" style="width:70%;"> <input type="text" id="node-input-start" data-i18n="[placeholder]rbe.placeholder.start" style="width:70%;">
</div> </div>
<div class="form-row"> <div class="form-row">
@ -28,7 +28,7 @@
<input type="text" id="node-input-property" style="width:70%;"/> <input type="text" id="node-input-property" style="width:70%;"/>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"/> <span data-i18n="rbe.label.name"></span></label> <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="rbe.label.name"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]rbe.label.name" style="width:70%;"> <input type="text" id="node-input-name" data-i18n="[placeholder]rbe.label.name" style="width:70%;">
</div> </div>
</script> </script>

2
function/rbe/rbe.js
View File

@ -54,7 +54,7 @@ module.exports = function(RED) {
if (node.pc) { node.gap = Math.abs(node.previous[t] * node.g / 100) || 0; } if (node.pc) { node.gap = Math.abs(node.previous[t] * node.g / 100) || 0; }
else { node.gap = Number(node.gap); } else { node.gap = Number(node.gap); }
if ((node.previous[t] === undefined) && (node.func === "narrowbandEq")) { node.previous[t] = n; } if ((node.previous[t] === undefined) && (node.func === "narrowbandEq")) { node.previous[t] = n; }
if (node.previous[t] === undefined) { node.previous[t] = n - node.gap; } if (node.previous[t] === undefined) { node.previous[t] = n - node.gap - 1; }
if (Math.abs(n - node.previous[t]) === node.gap) { if (Math.abs(n - node.previous[t]) === node.gap) {
if ((this.func === "deadbandEq")||(this.func === "narrowband")) { if ((this.func === "deadbandEq")||(this.func === "narrowband")) {
if (node.inout === "out") { node.previous[t] = n; } if (node.inout === "out") { node.previous[t] = n; }

7
test/function/rbe/rbe_spec.js
View File

@ -286,9 +286,12 @@ describe('rbe node', function() {
n2.on("input", function(msg) { n2.on("input", function(msg) {
c = c + 1; c = c + 1;
if (c === 1) { if (c === 1) {
msg.should.have.a.property("payload", 120); msg.should.have.a.property("payload", 100);
} }
else if (c === 2) { else if (c === 2) {
msg.should.have.a.property("payload", 111);
}
else if (c === 3) {
msg.should.have.a.property("payload", 135); msg.should.have.a.property("payload", 135);
done(); done();
} }
@ -296,8 +299,8 @@ describe('rbe node', function() {
n1.emit("input", {payload:100}); n1.emit("input", {payload:100});
n1.emit("input", {payload:95}); n1.emit("input", {payload:95});
n1.emit("input", {payload:105}); n1.emit("input", {payload:105});
n1.emit("input", {payload:111});
n1.emit("input", {payload:120}); n1.emit("input", {payload:120});
n1.emit("input", {payload:130});
n1.emit("input", {payload:135}); n1.emit("input", {payload:135});
}); });
}); });