This commit is contained in:
Christian Zufferey
2019-10-21 15:58:25 +02:00
parent b801fcc16d
commit e2d8734eb8
3 changed files with 14 additions and 49 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
version = "0.6.5 zf191021.1534"
version = "0.6.5 zf191021.1543"
print("luatool.py ver " + version)
@@ -71,14 +71,12 @@ class AbstractTransport:
self.writeln("file.writeline([==[" + data + "]==])\r")
def performcheck(self, expected):
print("toto1434")
line = ''
char = ''
i = -1
while char != chr(62): # '>'
char = self.read(1)
#print("toto14491 char: ." + char + ".")
if char == '£':
if char == '':
raise Exception('No proper answer from MCU')
if char == chr(13) or char == chr(10): # LF or CR
if line != '':
@@ -135,20 +133,12 @@ class SerialTransport(AbstractTransport):
line += char
i += 1
if args.verbose:
print("toto1518 line: ." + line + ".")
print("line: ." + line + ".")
def writeln(self, data, check=1):
print("toto1439 check: " + str(check))
# zzz191020 une petite pause après l'envoi de chaque ligne
# zzz191020 on fait une petite pause avant l'envoi de chaque ligne
sleep(self.delay)
if self.serial.inWaiting() > 0:
self.serial.flushInput()
if len(data) > 0 and not args.bar:
@@ -158,7 +148,6 @@ class SerialTransport(AbstractTransport):
# zzz191021 Affiche ce que l'on a envoyé au NodeMCU
if args.verbose:
print("\n\nzwrite0952: {" + data + "\n}\n")
print("toto1435 check: " + str(check))
if check > 0:
self.performcheck(data)
elif not args.bar:
@@ -253,18 +242,10 @@ if __name__ == '__main__':
if args.list:
# zzz191020 Amélioré la sortie du listing des fichiers
#sleep(1)
print("\ntoto1024\n")
transport.writeln("print('\\n-----');local l = file.list();for k,v in pairs(l) do print(k..', size:'..v)end;print('-----\\n')\r", 0)
#transport.writeln("print('toto et tutu')\r", 1)
print("\ntoto10241\n")
while True:
char = transport.read(1)
#print("toto1400: ." + char + ".")
if char == '' or char == chr(62): # '' or '>'
#if char == chr(62): # '>'
print("\ntoto1017: ." + char + ".")
break
sys.stdout.write(char)
sys.exit(0)