jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OTA] Fix "Error response from device" if OK response comes to early (#1695)

Browse Source 
Because TCP is stream-based, an earlier read can 'take away' the "OK" response
from the device, so that a later read doesn't get the message.
This commit is contained in:
Gei0r 2018-07-30 09:22:01 +02:00 committed by Me No Dev
parent a7ddf39521
commit bdc45e39ef
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/espota.py
View File

@ -179,6 +179,7 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
try: try:
connection.sendall(chunk) connection.sendall(chunk)
res = connection.recv(10) res = connection.recv(10)
lastResponseContainedOK = 'OK' in res.decode()
except: except:
sys.stderr.write('\n') sys.stderr.write('\n')
logging.error('Error Uploading') logging.error('Error Uploading')
@ -187,6 +188,13 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
sock.close() sock.close()
return 1 return 1
if lastResponseContainedOK:
logging.info('Success')
connection.close()
f.close()
sock.close()
return 0
sys.stderr.write('\n') sys.stderr.write('\n')
logging.info('Waiting for result...') logging.info('Waiting for result...')
try: try: