Mercurial > code > home > repos > homeauto
changeset 844:1757fc19f992
sba api updates
Ignore-this: 37fb9424b0620b64109297ebb786a471
darcs-hash:20120825212250-312f9-bb449d5ffbf5b87984350720a47083d6d9df5800
| author | drewp <drewp@bigasterisk.com> |
|---|---|
| date | Sat, 25 Aug 2012 14:22:50 -0700 |
| parents | 9d7f9c487634 |
| children | edd2486d6e2c |
| files | service/sba/sba.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)