# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1342445083 -28800
# Node ID f1428cddb8825f4abd2daa6dece4e81cc1359d44
# Parent  a17a5984116f99f135f0cdcf433d1910a7a89368
handle new next_wake format

diff -r a17a5984116f -r f1428cddb882 server/ts.py
--- a/server/ts.py	Mon Jul 16 21:24:16 2012 +0800
+++ b/server/ts.py	Mon Jul 16 21:24:43 2012 +0800
@@ -34,9 +34,9 @@
 
 def get_socket(addr):
     s = bluetooth.BluetoothSocket( bluetooth.RFCOMM )
-    s.settimeout(1)
     s.connect((addr, 1))
-
+    s.setblocking(False)
+            
     return s
 
 
@@ -99,13 +99,14 @@
         W("Bad response to btoff")
         return None
 
-    if not l.startswith('off:'):
+    if not l.startswith('next_wake'):
         W("Bad response to btoff '%s'" % l)
         return None
-    off, next_wake = l.rstrip().split(':')
-    L("Next wake %s" % next_wake)
+    L("Next wake line %s" % l)
 
-    return int(next_wake)
+    toks = dict(v.split('=') for v in l.split(','))
+
+    return int(toks['next_wake'])
 
 @retry()
 def clear_meas(sock):
@@ -160,7 +161,8 @@
 
 def setup_logging():
     logging.basicConfig(format='%(asctime)s %(message)s', 
-            datefmt='%m/%d/%Y %I:%M:%S %p')
+            datefmt='%m/%d/%Y %I:%M:%S %p',
+            level=logging.INFO)
 
 def main():
     setup_logging()
@@ -175,9 +177,8 @@
         try:
             sock = get_socket(config.BTADDR)
         except Exception, e:
+            logging.exception("Error connecting")
             pass
-            #print>>sys.stderr, "Error connecting:"
-            #traceback.print_exc(file=sys.stderr)
         next_wake_time = 0
         if sock:
             try: