frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make Pi GPIO node wait for close before restarting 

Looking to address Issue #530
This commit is contained in:
dceejay 2015-01-14 09:55:30 +00:00
parent fcec704b7b
commit eee2996e8a
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
nodes/core/hardware/36-rpi-gpio.js
View File

@ -104,14 +104,23 @@ module.exports = function(RED) {
node.error("Invalid GPIO pin: "+node.pin);
}
node.on("close", function() {
var wfi = function(done) {
if (!node.running) {
if (RED.settings.verbose) { node.log("end"); }
done();
return;
}
setTimeout( function() { wfi(done); }, 333 );
}
node.on("close", function(done) {
node.status({fill:"red",shape:"circle",text:""});
delete pinsInUse[node.pin];
if (node.child != null) {
node.child.stdin.write(" close "+node.pin);
node.child.kill('SIGKILL');
}
node.status({fill:"red",shape:"circle",text:""});
delete pinsInUse[node.pin];
if (RED.settings.verbose) { node.log("end"); }
wfi(done);
});
}
RED.nodes.registerType("rpi-gpio in",GPIOInNode);
@ -140,7 +149,7 @@ module.exports = function(RED) {
var limit = 1;
if (node.out === "pwm") { limit = 100; }
if ((out >= 0) && (out <= limit)) {
if (RED.settings.verbose) { node.log("inp: "+msg.payload); }
if (RED.settings.verbose) { node.log("out: "+msg.payload); }
if (node.child !== null) { node.child.stdin.write(msg.payload+"\n"); }
else { node.warn("Command not running"); }
node.status({fill:"green",shape:"dot",text:msg.payload});
@ -185,14 +194,23 @@ module.exports = function(RED) {
node.error("Invalid GPIO pin: "+node.pin);
}
node.on("close", function() {
var wfi = function(done) {
if (!node.running) {
if (RED.settings.verbose) { node.log("end"); }
done();
return;
}
setTimeout( function() { wfi(done); }, 333 );
}
node.on("close", function(done) {
node.status({fill:"red",shape:"circle",text:""});
delete pinsInUse[node.pin];
if (node.child != null) {
node.child.stdin.write(" close "+node.pin);
node.child.kill('SIGKILL');
}
node.status({fill:"red",shape:"circle",text:""});
delete pinsInUse[node.pin];
if (RED.settings.verbose) { node.log("end"); }
wfi(done);
});
}
@ -243,13 +261,22 @@ module.exports = function(RED) {
else { node.log('error: ' + err); }
});
node.on("close", function() {
var wfi = function(done) {
if (!node.running) {
if (RED.settings.verbose) { node.log("end"); }
done();
return;
}
setTimeout( function() { wfi(done); }, 333 );
}
node.on("close", function(done) {
node.status({fill:"red",shape:"circle",text:""});
if (node.child != null) {
node.child.kill('SIGINT');
node.child = null;
}
node.status({fill:"red",shape:"circle",text:""});
if (RED.settings.verbose) { node.log("end"); }
wfi(done());
});
}
RED.nodes.registerType("rpi-mouse",PiMouseNode);