1st public release

DexterInd · Mar 22, 2018 · fec1b23 · fec1b23
1 parent a3cfe0c
commit fec1b23
Show file tree

Hide file tree

Showing 8 changed files with 811 additions and 275 deletions.
diff --git a/Software/Scratch/GrovePiScratch.py b/Software/Scratch/GrovePiScratch.py
@@ -10,7 +10,7 @@
 # Nicole	Nov 16			Added Folder support for take_picture 
 # Nicole	Nov 16			Added eSpeak Support
 # Nicole	18 Nov 16		Adding PivotPi support
-# SimonWalters  23 Feb 18   Correct error handling error
+# SimonW    22 Mar 18       Bug fix in error handling line 383
 '''
 ## License
 
@@ -380,7 +380,7 @@ def match_sensors(msg,lst):
 		running= False
 		print "GrovePi Scratch: Disconnected from Scratch"
 		break
-	except (scratch.ScratchConnectionError,NameError) as e:
+	except (scratch.ScratchConnectionError,NameError) as e: #bug fix simonw 22Mar18
 		while True:
 			#thread1.join(0)
 			print "GrovePi Scratch: Scratch connection error, Retrying"
@@ -395,7 +395,4 @@ def match_sensors(msg,lst):
 				print "GrovePi Scratch: Scratch is either not opened or remote sensor connections aren't enabled\n..............................\n"
 	except:
 		e = sys.exc_info()[0]
-		print "GrovePi Scratch: Error %s" % e
-
-
-
+		print "GrovePi Scratch: Error %s" % e