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

Debugging discrete-in

Browse Source 
Coerce the currentState to always be numeric & use === tests
Catch the first spurious interrupt when x.value is undefined
Add more debug output
Add a second timer to get the first message out. This still fails at
node-RED startup when the node is not activeLow
This commit is contained in:
Maxwell Hadley 2014-02-06 22:11:09 +00:00
parent e9a860f36f
commit 4f509931ba
1 changed files with 122 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
hardware/BBB/145-digital-in.js
View File

@ -32,33 +32,39 @@ function DiscreteInputNode(n) {
this.topic = n.topic; // the topic is not currently used
this.pin = n.pin; // The Beaglebone Black pin identifying string
if (n.activeLow) // Set the 'active' state 0 or 1 as appropriate
this.activeState = "0";
this.activeState = 0;
else
this.activeState = "1";
this.updateInterval = n.updateInterval*1000; // How often to send total active time messages
this.activeState = 1;
this.updateInterval = n.updateInterval * 1000; // How often to send totalActiveTime messages
this.interruptAttached = false; // Flag: should we detach interrupt when we are closed?
this.intervalId = null; // Remember the timer ID so we can delete it when we are closed
this.currentState = 0; // The pin input state "1" or "0"
this.lastActiveTime = 0; // The date (in ms since epoch) when the pin last went high
this.lastActiveTime = NaN; // The date (in ms since epoch) when the pin last went high
this.totalActiveTime = 0; // The total time in ms that the pin has been high (since reset)
this.starting = true;
// Define 'node' to allow us to access 'this' from within callbacks (the 'var' is essential -
// otherwise there is only one 'node' for all instances of DiscreteInputNode!)
// otherwise there is only one global 'node' for all instances of DiscreteInputNode!)
var node = this;
// This function is called whenever the input pin changes state. We update the currentState
// and the ActiveTime variables, and send a message on the first output with the new state
// Note: this function gets called spuriously when the interrupt is first enabled: in this
// case x.value is undefined - we must test for this
var interruptCallback = function (x) {
if (node.currentState == x.value) {
node.log("interruptCallback: x.value = " + x.value);
node.log("interruptCallback: node.currentState = " + node.currentState);
node.log("interruptCallback: node.totalActiveTime = " + node.totalActiveTime);
node.log("interruptCallback: node.lastActiveTime = " + node.lastActiveTime);
if (node.currentState === x.value - 0) {
node.log("Spurious interrupt: " + x.value);
} else {
node.currentState = x.value;
} else if (x.value != undefined) {
node.currentState = x.value - 0;
var now = Date.now();
if (node.currentState == node.activeState) {
if (node.currentState === node.activeState) {
node.lastActiveTime = now;
} else {
} else if (!isNaN(node.lastActiveTime)) {
node.totalActiveTime += now - node.lastActiveTime;
}
var msg = {};
@ -71,7 +77,10 @@ function DiscreteInputNode(n) {
// This function is called by the timer. It updates the ActiveTime variables, and sends a
// message on the second output with the latest value of the total active time, in seconds
var timerCallback = function () {
if (node.currentState == node.activeState) {
node.log("timerCallback: node.currentState = " + node.currentState);
node.log("timerCallback: node.totalActiveTime = " + node.totalActiveTime);
node.log("timerCallback: node.lastActiveTime = " + node.lastActiveTime);
if (node.currentState === node.activeState) {
var now = Date.now();
node.totalActiveTime += now - node.lastActiveTime;
node.lastActiveTime = now;
@ -85,8 +94,11 @@ function DiscreteInputNode(n) {
// This function is called when we receive an input message. Clear the ActiveTime variables
// (so we start counting from zero again)
var inputCallback = function (msg) {
node.log("inputCallback: node.currentState = " + node.currentState);
node.log("inputCallback: node.totalActiveTime = " + node.totalActiveTime);
node.log("inputCallback: node.lastActiveTime = " + node.lastActiveTime);
node.totalActiveTime = 0;
if (node.currentState == node.activeState) {
if (node.currentState === node.activeState) {
node.lastActiveTime = Date.now();
}
if (node.starting) {
@ -94,10 +106,10 @@ function DiscreteInputNode(n) {
var msg = [{topic:node.topic}, {topic:node.topic}];
msg[0].payload = node.currentState;
msg[1].payload = node.totalActiveTime;
this.send(msg);
node.send(msg);
node.log("Initial message: " + msg[0].payload + " " + msg[1].payload);
node.log("currentState: " + this.currentState);
node.log("activeTime: " + this.totalActiveTime);
node.log("currentState: " + node.currentState);
node.log("activeTime: " + node.totalActiveTime);
}
};
@ -106,12 +118,17 @@ function DiscreteInputNode(n) {
"P8_16", "P8_17", "P8_18", "P8_19", "P8_26", "P9_11", "P9_12", "P9_13", "P9_14",
"P9_15", "P9_16", "P9_17", "P9_18", "P9_21", "P9_22", "P9_23", "P9_24", "P9_26",
"P9_27", "P9_30", "P9_41", "P9_42"].indexOf(node.pin) >= 0) {
setTimeout(function () {
bs.pinMode(node.pin, bs.INPUT);
bs.digitalRead(node.pin, function (x) {
// Initialise the currentState and lastActveTime variables based on the value read
node.currentState = x.value;
node.error("First read - currentState: " + node.currentState);
if (node.currentState == node.activeState) {
node.log("digitalRead: x.value = " + x.value);
node.log("digitalRead: node.currentState = " + node.currentState);
node.log("digitalRead: node.totalActiveTime = " + node.totalActiveTime);
node.log("digitalRead: node.lastActiveTime = " + node.lastActiveTime);
node.currentState = x.value - 0;
node.log("First read - currentState: " + node.currentState);
if (node.currentState === node.activeState) {
node.lastActiveTime = Date.now();
}
// Attempt to attach a change-of-state interrupt handler to the pin. If we succeed,
@ -126,6 +143,7 @@ function DiscreteInputNode(n) {
}
setTimeout(function () { node.emit("input", {}); }, 50);
});
}, 50);
} else {
node.error("Unconfigured input pin");
}
@ -134,12 +152,12 @@ function DiscreteInputNode(n) {
// Register the node by name. This must be called before overriding any of the Node functions.
RED.nodes.registerType("discrete-in", DiscreteInputNode);
// On close, detach the interrupt (if we attaced one) and clear the interval (if we set one)
// On close, detach the interrupt (if we attached one) and clear the interval (if we set one)
DiscreteInputNode.prototype.close = function () {
if (this.interruptAttached) {
bs.detachInterrupt(this.pin);
}
if (this.intervalId != null) {
if (this.intervalId !== null) {
clearInterval(this.intervalId);
}
};