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 BBB node input interrupt attach failure

Browse Source
This commit is contained in:
Dave Conway-Jones 2016-02-01 10:26:04 +00:00
parent 32706ff92c
commit 7cb43208e6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hardware/BBB/145-BBB-hardware.js
View File

@ -36,8 +36,8 @@ module.exports = function (RED) {
} }
return pin; return pin;
}; };
setPinMode = function (pin, direction, callback) { setPinMode = function (pin, mode, callback) {
bonescript.pinMode(pin, direction, callback); bonescript.pinMode(pin, mode, callback);
} }
// Node constructor for bbb-analogue-in // Node constructor for bbb-analogue-in
@ -246,7 +246,7 @@ module.exports = function (RED) {
bonescript.detachInterrupt(node._pin); bonescript.detachInterrupt(node._pin);
process.nextTick(function () { process.nextTick(function () {
setPinMode(node._pin, bonescript.INPUT, function (response, pin) { setPinMode(node._pin, bonescript.INPUT, function (response, pin) {
if (response.hasOwnProperty("value") && response.value === true) { if (!response) {
bonescript.digitalRead(node._pin, function (err, x) { bonescript.digitalRead(node._pin, function (err, x) {
// Initialise the currentState and lastActiveTime variables based on the value read // Initialise the currentState and lastActiveTime variables based on the value read
node.currentState = Number(x.value); node.currentState = Number(x.value);
@ -255,14 +255,14 @@ module.exports = function (RED) {
} }
// Attempt to attach a change-of-state interrupt handler to the pin. If we succeed, // Attempt to attach a change-of-state interrupt handler to the pin. If we succeed,
// the input event and interval handlers will be installed by interruptCallback // the input event and interval handlers will be installed by interruptCallback
bonescript.attachInterrupt(node._pin, true, bonescript.CHANGE, interruptCallback); bonescript.attachInterrupt(node._pin, bonescript.CHANGE, interruptCallback);
// Send an initial message with the pin state on the first output // Send an initial message with the pin state on the first output
setTimeout(function () { setTimeout(function () {
node.emit("input", {}); node.emit("input", {});
}, 50); }, 50);
}); });
} else { } else {
node.error("Unable to set " + pin + " as input: " + response.err); node.error("Unable to set " + pin + " as input: " + response);
} }
}); });
}); });
@ -342,7 +342,7 @@ module.exports = function (RED) {
bonescript.detachInterrupt(node._pin); bonescript.detachInterrupt(node._pin);
process.nextTick(function () { process.nextTick(function () {
setPinMode(node._pin, bonescript.INPUT, function (response, pin) { setPinMode(node._pin, bonescript.INPUT, function (response, pin) {
if (response.value === true) { if (!response) {
bonescript.digitalRead(node._pin, function (err, x) { bonescript.digitalRead(node._pin, function (err, x) {
// Initialise the currentState based on the value read // Initialise the currentState based on the value read
node.currentState = Number(x.value); node.currentState = Number(x.value);
@ -357,10 +357,10 @@ module.exports = function (RED) {
} }
// Attempt to attach the required interrupt handler to the pin. If we succeed, // Attempt to attach the required interrupt handler to the pin. If we succeed,
// the input event and interval handlers will be installed by interruptCallback // the input event and interval handlers will be installed by interruptCallback
bonescript.attachInterrupt(node._pin, true, interruptType, interruptCallback) bonescript.attachInterrupt(node._pin, interruptType, interruptCallback)
}); });
} else { } else {
node.error("Unable to set " + pin + " as input: " + response.err); node.error("Unable to set " + pin + " as input: " + response);
} }
}); });
}); });

2
hardware/BBB/package.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "node-red-node-beaglebone", "name" : "node-red-node-beaglebone",
"version" : "0.1.2", "version" : "0.1.3",
"description" : "A set of Node-RED nodes to interface to the GPIO pins of a Beaglebone Black board", "description" : "A set of Node-RED nodes to interface to the GPIO pins of a Beaglebone Black board",
"dependencies" : { "dependencies" : {
"octalbonescript":"^1.1.*" "octalbonescript":"^1.1.*"