From 8b31a918a4ef352f4b36086592844d181ad9cddc Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Mon, 27 Feb 2017 19:22:02 +0000
Subject: [PATCH] Fix Pi GPIO debounce

To close #1139
---
 nodes/core/hardware/36-rpi-gpio.html |  3 ---
 nodes/core/hardware/36-rpi-gpio.js   | 11 ++++++++---
 nodes/core/hardware/nrgpio.py        |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/nodes/core/hardware/36-rpi-gpio.html b/nodes/core/hardware/36-rpi-gpio.html
index 627129364..37c63fafd 100644
--- a/nodes/core/hardware/36-rpi-gpio.html
+++ b/nodes/core/hardware/36-rpi-gpio.html
@@ -218,7 +218,6 @@
     var pinsInUse = {};
     RED.nodes.registerType('rpi-gpio out',{
         category: 'Raspberry Pi',
-        label: 'Raspberry Pi',
         color:"#c6dbef",
         defaults: {
             name: { value:"" },
@@ -351,7 +350,6 @@
 <script type="text/javascript">
     RED.nodes.registerType('rpi-mouse',{
         category: 'Raspberry Pi',
-        label: 'Raspberry Pi',
         color:"#c6dbef",
         defaults: {
             name: { value:"" },
@@ -390,7 +388,6 @@
 <script type="text/javascript">
     RED.nodes.registerType('rpi-keyboard',{
         category: 'Raspberry Pi',
-        label: 'Raspberry Pi',
         color:"#c6dbef",
         defaults: {
             name: { value:"" }
diff --git a/nodes/core/hardware/36-rpi-gpio.js b/nodes/core/hardware/36-rpi-gpio.js
index d249d0926..48ad858d3 100644
--- a/nodes/core/hardware/36-rpi-gpio.js
+++ b/nodes/core/hardware/36-rpi-gpio.js
@@ -37,8 +37,13 @@ module.exports = function(RED) {
             fs.statSync("/usr/lib/python2.7/site-packages/RPi/GPIO"); // test on Arch
         }
         catch(err) {
-            RED.log.warn(RED._("rpi-gpio.errors.libnotfound"));
-            throw "Warning : "+RED._("rpi-gpio.errors.libnotfound");
+            try {
+                fs.statSync("/usr/lib/python2.7/dist-packages/RPi/GPIO"); // test on Hypriot
+            }
+            catch(err) {
+                RED.log.warn(RED._("rpi-gpio.errors.libnotfound"));
+                throw "Warning : "+RED._("rpi-gpio.errors.libnotfound");
+            }
         }
     }
 
@@ -79,7 +84,7 @@ module.exports = function(RED) {
             node.child.stdout.on('data', function (data) {
                 var d = data.toString().trim().split("\n");
                 for (var i = 0; i < d.length; i++) {
-                    if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i]))) {
+                    if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i])) && node.buttonState !== d[i]) {
                         node.send({ topic:"pi/"+node.pin, payload:Number(d[i]) });
                     }
                     node.buttonState = d[i];
diff --git a/nodes/core/hardware/nrgpio.py b/nodes/core/hardware/nrgpio.py
index 207729f18..73f395fb0 100755
--- a/nodes/core/hardware/nrgpio.py
+++ b/nodes/core/hardware/nrgpio.py
@@ -99,9 +99,9 @@ if len(sys.argv) > 2:
 
     elif cmd == "in":
         #print "Initialised pin "+str(pin)+" to IN"
-        bounce = int(sys.argv[4])
+        bounce = float(sys.argv[4])
         def handle_callback(chan):
-            sleep(bounce/1000)
+            sleep(bounce/1000.0)
             print GPIO.input(chan)
 
         if sys.argv[3].lower() == "up":
@@ -112,7 +112,7 @@ if len(sys.argv) > 2:
             GPIO.setup(pin,GPIO.IN)
 
         print GPIO.input(pin)
-        GPIO.add_event_detect(pin, GPIO.BOTH, callback=handle_callback, bouncetime=bounce)
+        GPIO.add_event_detect(pin, GPIO.BOTH, callback=handle_callback, bouncetime=int(bounce))
 
         while True:
             try: