Merge branch 'osc' of github.com:rcoh/SmootLight into osc

1 files changed, 16 insertions, 13 deletions

diff --git a/inputs/RandomLocs.py b/inputs/RandomLocs.py
index d1ce1c7..f4182cf 100644
--- a/inputs/RandomLocs.py
+++ b/inputs/RandomLocs.py
@@ -1,13 +1,16 @@
-import util.TimeOps as clock
-import random
-import util.Geo as Geo
-import util.Strings as Strings
-from operationscore.Input import *
-class RandomLocs(Input):
-    def inputInit(self):
-        self['LastEvent'] = clock.time()
-    def sensingLoop(self): #TODO: move to params
-        currentTime = clock.time()
-        if currentTime - self['LastEvent'] > 2000:
-            self.respond({Strings.LOCATION: Geo.randomLoc((50,50))})
-            self['LastEvent'] = currentTime
+import util.TimeOps as clock

+import random

+import util.Geo as Geo

+import util.Strings as Strings

+from operationscore.Input import *

+class RandomLocs(Input):

+    """RandomLocs is an Input that generates RandomLocations at a preset but randomly changing time interval.  Just a

+    prototype, some assembly required."""

+

+    def inputInit(self):

+        self['LastEvent'] = clock.time()

+    def sensingLoop(self): #TODO: move to params

+        currentTime = clock.time()

+        if currentTime - self['LastEvent'] > 200+500*random.random():

+            self.respond({Strings.LOCATION: Geo.randomLoc((200,200))})

+            self['LastEvent'] = currentTime