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

Cleanup closing down of Pi gpio nodes

Browse Source
This commit is contained in:
dceejay 2015-01-29 15:52:57 +00:00
parent ca9d84b1b7
commit cae755d948
2 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodes/core/hardware/36-rpi-gpio.html
View File

@ -325,7 +325,11 @@
outputs:1, outputs:1,
icon: "rpi.png", icon: "rpi.png",
label: function() { label: function() {
return this.name||"Pi Mouse" ; var na = "Pi Mouse";
if (this.butt === "1") { na += " Left"; }
if (this.butt === "2") { na += " Right"; }
if (this.butt === "4") { na += " Middle"; }
return this.name||na;
}, },
labelStyle: function() { labelStyle: function() {
return this.name?"node_label_italic":""; return this.name?"node_label_italic":"";

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

@ -87,10 +87,11 @@ module.exports = function(RED) {
}); });
node.child.on('close', function (code) { node.child.on('close', function (code) {
if (RED.settings.verbose) { node.log("ret: "+code+" :"); }
node.child = null; node.child = null;
node.running = false; node.running = false;
node.status({fill:"red",shape:"circle",text:""}); node.status({fill:"red",shape:"circle",text:""});
if (RED.settings.verbose) { node.log("closed"); }
node.done();
}); });
node.child.on('error', function (err) { node.child.on('error', function (err) {
@ -104,15 +105,6 @@ module.exports = function(RED) {
node.error("Invalid GPIO pin: "+node.pin); node.error("Invalid GPIO pin: "+node.pin);
} }
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.on("close", function(done) {
node.status({fill:"red",shape:"circle",text:""}); node.status({fill:"red",shape:"circle",text:""});
delete pinsInUse[node.pin]; delete pinsInUse[node.pin];
@ -120,7 +112,7 @@ module.exports = function(RED) {
node.child.stdin.write(" close "+node.pin); node.child.stdin.write(" close "+node.pin);
node.child.kill('SIGKILL'); node.child.kill('SIGKILL');
} }
wfi(done); node.done = done;
}); });
} }
RED.nodes.registerType("rpi-gpio in",GPIOInNode); RED.nodes.registerType("rpi-gpio in",GPIOInNode);
@ -177,10 +169,11 @@ module.exports = function(RED) {
}); });
node.child.on('close', function (code) { node.child.on('close', function (code) {
if (RED.settings.verbose) { node.log("ret: "+code+" :"); }
node.child = null; node.child = null;
node.running = false; node.running = false;
node.status({fill:"red",shape:"circle",text:""}); node.status({fill:"red",shape:"circle",text:""});
if (RED.settings.verbose) { node.log("closed"); }
node.done();
}); });
node.child.on('error', function (err) { node.child.on('error', function (err) {
@ -194,15 +187,6 @@ module.exports = function(RED) {
node.error("Invalid GPIO pin: "+node.pin); node.error("Invalid GPIO pin: "+node.pin);
} }
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.on("close", function(done) {
node.status({fill:"red",shape:"circle",text:""}); node.status({fill:"red",shape:"circle",text:""});
delete pinsInUse[node.pin]; delete pinsInUse[node.pin];
@ -210,7 +194,7 @@ module.exports = function(RED) {
node.child.stdin.write(" close "+node.pin); node.child.stdin.write(" close "+node.pin);
node.child.kill('SIGKILL'); node.child.kill('SIGKILL');
} }
wfi(done); node.done = done;
}); });
} }
@ -249,10 +233,11 @@ module.exports = function(RED) {
}); });
node.child.on('close', function (code) { node.child.on('close', function (code) {
if (RED.settings.verbose) { node.log("ret: "+code+" :"); }
node.child = null; node.child = null;
node.running = false; node.running = false;
node.status({fill:"red",shape:"circle",text:""}); node.status({fill:"red",shape:"circle",text:""});
if (RED.settings.verbose) { node.log("closed"); }
node.done();
}); });
node.child.on('error', function (err) { node.child.on('error', function (err) {
@ -261,22 +246,13 @@ module.exports = function(RED) {
else { node.log('error: ' + err); } else { node.log('error: ' + err); }
}); });
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.on("close", function(done) {
node.status({fill:"red",shape:"circle",text:""}); node.status({fill:"red",shape:"circle",text:""});
if (node.child != null) { if (node.child != null) {
node.child.kill('SIGINT'); node.child.kill('SIGINT');
node.child = null; node.child = null;
} }
wfi(done()); node.done = done;
}); });
} }
RED.nodes.registerType("rpi-mouse",PiMouseNode); RED.nodes.registerType("rpi-mouse",PiMouseNode);