# HG changeset patch
# User drewp <drewp@bigasterisk.com>
# Date 1345929770 25200
# Node ID 1757fc19f992762f411ab54b9b41531eb1103d93
# Parent  9d7f9c487634a246d03dfc682b61341f7e9c3c23
sba api updates

Ignore-this: 37fb9424b0620b64109297ebb786a471

darcs-hash:20120825212250-312f9-bb449d5ffbf5b87984350720a47083d6d9df5800

diff -r 9d7f9c487634 -r 1757fc19f992 service/sba/sba.py
--- a/service/sba/sba.py	Sat Aug 25 14:22:19 2012 -0700
+++ b/service/sba/sba.py	Sat Aug 25 14:22:50 2012 -0700
@@ -1,5 +1,5 @@
 from __future__ import division
-import serial, time, jsonlib, sys, cgi, argparse, os
+import serial, time, json, sys, cgi, argparse, os
 import cyclone.web
 from twisted.python import log
 from twisted.internet import reactor
@@ -14,7 +14,7 @@
         log.msg("reopening port")
 	# this timeout will fire every few seconds
         self.s = serial.Serial(self.port, baudrate=115200, timeout=0.020)
-        log.msg(str(self.s.__dict__))
+        #log.msg(str(self.s.__dict__))
         self.sendControl()
 
     def ping(self):
@@ -122,7 +122,7 @@
         if ctype == 'text/plain':
             color = decode8bitHexColor(d)
         elif ctype == 'application/json':
-            color = jsonlib.read(d)['rgb10']
+            color = json.loads(d)['rgb10']
         elif ctype == 'application/x-www-form-urlencoded':
             color = decode8bitHexColor(cgi.parse_qs(d)['color'][0])
         else:
@@ -169,7 +169,7 @@
     parser.add_argument('-v', '--verbose', action="store_true", help='logging')
     args = parser.parse_args()
 
-    sba = Sba("/dev/serial/by-id/usb-http:__engr.biz_CDC_RS-232_SB-Av1.0-if00")
+    sba = Sba("/dev/ttyUSB3")#/dev/serial/by-id/usb-http:__engr.biz_CDC_RS-232_SB-Av1.0-if00-port0")
 
     chain = BriteChain(sba)