Browse Source

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>
Zion Orent 9 years ago
parent
commit
78482791c1
2 changed files with 58 additions and 1 deletions
  1. 1
    1
      examples/javascript/grovecollision.js
  2. 57
    0
      examples/python/grovecollision.py

+ 1
- 1
examples/javascript/grovecollision.js View File

@@ -43,7 +43,7 @@ var myInterval = setInterval(function()
43 43
 		console.log("Collision!");
44 44
 		collisionState = true;
45 45
 	}
46
-	else if (collisionState)
46
+	else if (!collision_obj.isColliding() && collisionState)
47 47
 	{
48 48
 		console.log("No collision");
49 49
 		collisionState = false;

+ 57
- 0
examples/python/grovecollision.py View File

@@ -0,0 +1,57 @@
1
+#!/usr/bin/python
2
+# Author: Zion Orent <zorent@ics.com>
3
+# Copyright (c) 2015 Intel Corporation.
4
+#
5
+# Permission is hereby granted, free of charge, to any person obtaining
6
+# a copy of this software and associated documentation files (the
7
+# "Software"), to deal in the Software without restriction, including
8
+# without limitation the rights to use, copy, modify, merge, publish,
9
+# distribute, sublicense, and/or sell copies of the Software, and to
10
+# permit persons to whom the Software is furnished to do so, subject to
11
+# the following conditions:
12
+#
13
+# The above copyright notice and this permission notice shall be
14
+# included in all copies or substantial portions of the Software.
15
+#
16
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
+
24
+import time, sys, signal, atexit
25
+import pyupm_grovecollision as upmGrovecollision
26
+
27
+# The was tested with the Grove Collision Sensor
28
+# Instantiate a Grove Collision on digital pin D2
29
+myGrovecollision = upmGrovecollision.GroveCollision(2)
30
+
31
+
32
+## Exit handlers ##
33
+# This stops python from printing a stacktrace when you hit control-C
34
+def SIGINTHandler(signum, frame):
35
+	raise SystemExit
36
+
37
+# This lets you run code on exit,
38
+# including functions from myGrovecollision
39
+def exitHandler():
40
+	print "Exiting"
41
+	sys.exit(0)
42
+
43
+# Register exit handlers
44
+atexit.register(exitHandler)
45
+signal.signal(signal.SIGINT, SIGINTHandler)
46
+
47
+
48
+collisionState = False
49
+print "No collision"
50
+
51
+while(1):
52
+	if (myGrovecollision.isColliding() and not collisionState):
53
+		print "Collision!"
54
+		collisionState = True
55
+	elif (not myGrovecollision.isColliding() and collisionState):
56
+		print "No collision"
57
+		collisionState = False