diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/lib/proto.py | 28 | ||||
| -rw-r--r-- | admin/options.py | 2 |
2 files changed, 9 insertions, 21 deletions
diff --git a/admin/lib/proto.py b/admin/lib/proto.py index 8ceb8d8..c00c9b7 100644 --- a/admin/lib/proto.py +++ b/admin/lib/proto.py @@ -2,8 +2,6 @@ from time import sleep from sys import stderr import serial -import socket -import ssl from command import Command import options @@ -16,30 +14,20 @@ class Proto(object): kwa.update(options.serial) kwa.update(kwargs) url = url or options.url - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.settimeout(20) - print ('wrapping..') - ctx = ssl.create_default_context() - self.sock = ssl.wrap_socket(sock) - print ('connecting') - self.sock.connect((url, 443)) - self.sock.settimeout(60) - print ('done') - - self.fd = self.sock.makefile() - #self.fd = serial.serial_for_url(url, **kwa) + self.fd = serial.serial_for_url(url, **kwa) sleep(options.init_sleep) - ##self.fd.flushInput() - #self.fd.flushOutput() - print >> stderr, 'Serial port ready' + self.fd.flushInput() + self.fd.flushOutput() + print('Serial port ready') def send(self, command): cmd = str(command) + '\n' - print cmd + print(cmd) for i in cmd: - self.sock.send(i) + sleep(0.02) + self.fd.write(i) def recv(self): line = self.fd.readline() - print (line) + print(line) if line[0] != '$': return self.recv() cmd = Command.from_str(line) diff --git a/admin/options.py b/admin/options.py index b8c7025..58c5f73 100644 --- a/admin/options.py +++ b/admin/options.py @@ -1,4 +1,4 @@ -url = '10.8.0.119' +url = '/dev/ttyACM0' serial = dict( baudrate = 19200, timeout = 60, |