# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1340465760 -28800
# Node ID 536128b90573c7a97a5683cc598877b35e670877
# Parent  56f22e29582a7c5dcc9beee181a7916febc699f4
mostly works

diff -r 56f22e29582a -r 536128b90573 server/ts.py
--- a/server/ts.py	Sat Jun 23 22:12:07 2012 +0800
+++ b/server/ts.py	Sat Jun 23 23:36:00 2012 +0800
@@ -1,14 +1,14 @@
 #!/usr/bin/env python2.7
 
 BTADDR = "00:12:03:27:70:88"
-SLEEP_TIME = 180
+SLEEP_TIME = 2
 # time that the bluetooth takes to get going?
 EXTRA_WAKEUP = 0
 
 FETCH_TRIES = 3
 
 # avoid turning off the bluetooth etc.
-TESTING = True
+TESTING = False
 
 import sys
 # for wrt
@@ -97,7 +97,7 @@
 @retry()
 def turn_off(sock):
     if TESTING:
-        return None
+        return 99
     sock.send("btoff\n");
     # read newline
     l = readline(sock)
@@ -105,9 +105,11 @@
         print>>sys.stderr, "Bad response to btoff\n"
         return None
 
+    if not l.startswith('off:'):
+        print>>sys.stderr, "Bad response to btoff '%s'\n" % l
+        return None
     off, next_wake = l.rstrip().split(':')
-    if off != 'Off':
-        print>>sys.stderr, "Bad response to btoff '%s'\n" % l
+    print>>sys.stderr, "Next wake %s" % next_wake
 
     return int(next_wake)
 
@@ -167,7 +169,7 @@
         time.sleep(length)
 
 def main():
-	next_wake_time = 0
+    next_wake_time = 0
 
     while True:
         sock = None
@@ -181,15 +183,14 @@
             next_wake = None
             try:
                 next_wake_interval = do_comms(sock)
-                next_wake_time = time.now() + next_wake_interval
+                next_wake_time = time.time() + next_wake_interval
             except Exception, e:
                 print>>sys.stderr, "Error in do_comms:"
                 traceback.print_exc(file=sys.stderr)
-            if next_wake_time > time.now():
-                sleep_time = min(next_wake_time - time.now() - EXTRA_WAKEUP, sleep_time)
+            if next_wake_time > time.time():
+                sleep_time = min(next_wake_time - time.time() - EXTRA_WAKEUP, sleep_time)
 
-        if TESTING:
-            print "Sleeping for %d" % sleep_time
+        print "Sleeping for %d" % sleep_time
         sleep_for(sleep_time)
 
 if __name__ == '__main__':