Skip to content

Fix espota completion success/fail check #7204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 16, 2020
Merged

Fix espota completion success/fail check #7204

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3837cf7
Fix espota completion success/fail check
earlephilhower Apr 9, 2020
46af6b9
Fix space/tab mismatch
earlephilhower Apr 10, 2020
7754a3e
Merge branch 'master' into espota1
earlephilhower Apr 10, 2020
2e089cc
Merge branch 'master' into espota1
earlephilhower Apr 10, 2020
7a7104a
Merge branch 'master' into espota1
devyte Apr 11, 2020
2a707c1
Address review comments
earlephilhower Apr 12, 2020
739b7da
Merge branch 'master' into espota1
earlephilhower Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion libraries/ArduinoOTA/ArduinoOTA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,13 @@ void ArduinoOTAClass::_runUpdate() {
}

if (Update.end()) {
// Ensure last count packet has been sent out and not combined with the final OK
client.flush();
delay(1000);
client.print("OK");
client.stop();
client.flush();
delay(1000);
client.stop();
#ifdef OTA_DEBUG
OTA_DEBUG.printf("Update Success\n");
#endif
Expand Down
29 changes: 17 additions & 12 deletions tools/espota.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
sys.stderr.write('FAIL\n')
logging.error('%s', data)
sock2.close()
sys.exit(1);
sys.exit(1)
return 1
sys.stderr.write('OK\n')
else:
Expand Down Expand Up @@ -172,7 +172,7 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
connection.sendall(chunk)
if connection.recv(32).decode().find('O') >= 0:
# connection will receive only digits or 'OK'
received_ok = True;
received_ok = True
except:
sys.stderr.write('\n')
logging.error('Error Uploading')
Expand All @@ -188,19 +188,24 @@ def serve(remoteAddr, localAddr, remotePort, localPort, password, filename, comm
# the connection before receiving the 'O' of 'OK'
try:
connection.settimeout(60)
while not received_ok:
if connection.recv(32).decode().find('O') >= 0:
# connection will receive only digits or 'OK'
received_ok = True;
logging.info('Result: OK')
received_ok = False
received_error = False
while not (received_ok or received_error):
reply = connection.recv(64).decode()
if reply.find('E') >= 0:
sys.stderr.write('\n')
logging.error('%s', reply)
received_error = True
elif reply.find('O') >= 0:
logging.info('Result: OK')
received_ok = True
connection.close()
f.close()
sock.close()
if (data != "OK"):
sys.stderr.write('\n')
logging.error('%s', data)
return 1;
return 0
if received_ok:
return 0
else:
return 1
except:
logging.error('No Result!')
connection.close()
Expand Down