arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-03 20:44:46 +03:00
Code

Merge pull request #1 from adrionics/adrionics-patch-updater-stream-timeout

Browse Source 
Update Updater.cpp
This commit is contained in:
adrionics 2019-05-19 12:12:31 -06:00 committed by GitHub
commit 0328fde3c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cores/esp8266/Updater.cpp
View File

@ -433,7 +433,7 @@ bool UpdaterClass::_verifyEnd() {
return false;
}
size_t UpdaterClass::writeStream(Stream &data) {
size_t UpdaterClass::writeStream(Stream &data, uint16_t streamTimeout) {
size_t written = 0;
size_t toRead = 0;
if(hasError() || !isRunning())
@ -446,6 +446,7 @@ size_t UpdaterClass::writeStream(Stream &data) {
_reset();
return 0;
}
unsigned long timeout = millis();
if (_progress_callback) {
_progress_callback(0, _size);
}
@ -463,14 +464,15 @@ size_t UpdaterClass::writeStream(Stream &data) {
}
toRead = data.readBytes(_buffer + _bufferLen, bytesToRead);
if(toRead == 0) { //Timeout
delay(100);
toRead = data.readBytes(_buffer + _bufferLen, bytesToRead);
if(toRead == 0) { //Timeout
if (millis() - timeout > streamTimeout) {
_currentAddress = (_startAddress + _size);
_setError(UPDATE_ERROR_STREAM);
_reset();
return written;
}
delay(100);
} else {
timeout = millis();
}
if(_ledPin != -1) {
digitalWrite(_ledPin, !_ledOn); // Switch LED off