From 78482791c1a1ff58b53d322f3e6cbbbfa3c8eed6 Mon Sep 17 00:00:00 2001
From: Zion Orent <zorent@ics.com>
Date: Tue, 24 Mar 2015 15:00:10 -0400
Subject: [PATCH] grovecollision: python example and updated JS example for
 grove collision sensor

Signed-off-by: Zion Orent <zorent@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 examples/javascript/grovecollision.js |  2 +-
 examples/python/grovecollision.py     | 57 +++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 examples/python/grovecollision.py

diff --git a/examples/javascript/grovecollision.js b/examples/javascript/grovecollision.js
index 71774a17..dc577a46 100644
--- a/examples/javascript/grovecollision.js
+++ b/examples/javascript/grovecollision.js
@@ -43,7 +43,7 @@ var myInterval = setInterval(function()
 		console.log("Collision!");
 		collisionState = true;
 	}
-	else if (collisionState)
+	else if (!collision_obj.isColliding() && collisionState)
 	{
 		console.log("No collision");
 		collisionState = false;
diff --git a/examples/python/grovecollision.py b/examples/python/grovecollision.py
new file mode 100644
index 00000000..6cdd05cf
--- /dev/null
+++ b/examples/python/grovecollision.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+# Author: Zion Orent <zorent@ics.com>
+# Copyright (c) 2015 Intel Corporation.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import time, sys, signal, atexit
+import pyupm_grovecollision as upmGrovecollision
+
+# The was tested with the Grove Collision Sensor
+# Instantiate a Grove Collision on digital pin D2
+myGrovecollision = upmGrovecollision.GroveCollision(2)
+
+
+## Exit handlers ##
+# This stops python from printing a stacktrace when you hit control-C
+def SIGINTHandler(signum, frame):
+	raise SystemExit
+
+# This lets you run code on exit,
+# including functions from myGrovecollision
+def exitHandler():
+	print "Exiting"
+	sys.exit(0)
+
+# Register exit handlers
+atexit.register(exitHandler)
+signal.signal(signal.SIGINT, SIGINTHandler)
+
+
+collisionState = False
+print "No collision"
+
+while(1):
+	if (myGrovecollision.isColliding() and not collisionState):
+		print "Collision!"
+		collisionState = True
+	elif (not myGrovecollision.isColliding() and collisionState):
+		print "No collision"
+		collisionState = False