djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: Improve reading back from pyboard.

Browse Source
This commit is contained in:
Damien George 2014-04-03 22:44:37 +01:00
parent 57ad7aa66b
commit d71fc37af7
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/pyboard.py
View File

@ -58,16 +58,25 @@ class Pyboard:
if data != b'OK': if data != b'OK':
raise Exception('could not exec command') raise Exception('could not exec command')
data = self.serial.read(2) data = self.serial.read(2)
while self.serial.inWaiting() > 0: timeout = 0
data = data + self.serial.read(self.serial.inWaiting()) while True:
time.sleep(0.01) if self.serial.inWaiting() > 0:
data = data + self.serial.read(self.serial.inWaiting())
timeout = 0
elif data.endswith(b'\x04>'):
break
else:
timeout += 1
if timeout > 100:
break
time.sleep(0.1)
if not data.endswith(b'\x04>'): if not data.endswith(b'\x04>'):
print(data) print(data)
raise Exception('could not exec command') raise Exception('timeout waiting for EOF reception')
if data.startswith(b'Traceback') or data.startswith(b' File '): if data.startswith(b'Traceback') or data.startswith(b' File '):
print(data) print(data)
raise Exception('command failed') raise Exception('command failed')
return str(data[:-2], encoding='ascii') return data[:-2]
def execfile(self, filename): def execfile(self, filename):
with open(filename) as f: with open(filename) as f:
@ -82,7 +91,7 @@ def execfile(filename, device='/dev/ttyACM0'):
pyb = Pyboard(device) pyb = Pyboard(device)
pyb.enter_raw_repl() pyb.enter_raw_repl()
output = pyb.execfile(filename) output = pyb.execfile(filename)
print(output, end='') print(str(output, encoding='ascii'), end='')
pyb.exit_raw_repl() pyb.exit_raw_repl()
pyb.close() pyb.close()