The progress callback is now correctly invoked with Update.write (#3024)
The progress callback was only invoked with Update.writeStream before
This commit is contained in:
parent
ec40c4c96f
commit
61f71930e9
@ -189,6 +189,9 @@ bool UpdateClass::_writeBuffer(){
|
|||||||
//this ensures that partially written firmware will not be bootable
|
//this ensures that partially written firmware will not be bootable
|
||||||
_buffer[0] = 0xFF;
|
_buffer[0] = 0xFF;
|
||||||
}
|
}
|
||||||
|
if (!_progress && _progress_callback) {
|
||||||
|
_progress_callback(0, _size);
|
||||||
|
}
|
||||||
if(!ESP.flashEraseSector((_partition->address + _progress)/SPI_FLASH_SEC_SIZE)){
|
if(!ESP.flashEraseSector((_partition->address + _progress)/SPI_FLASH_SEC_SIZE)){
|
||||||
_abort(UPDATE_ERROR_ERASE);
|
_abort(UPDATE_ERROR_ERASE);
|
||||||
return false;
|
return false;
|
||||||
@ -204,6 +207,9 @@ bool UpdateClass::_writeBuffer(){
|
|||||||
_md5.add(_buffer, _bufferLen);
|
_md5.add(_buffer, _bufferLen);
|
||||||
_progress += _bufferLen;
|
_progress += _bufferLen;
|
||||||
_bufferLen = 0;
|
_bufferLen = 0;
|
||||||
|
if (_progress_callback) {
|
||||||
|
_progress_callback(_progress, _size);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -319,9 +325,6 @@ size_t UpdateClass::writeStream(Stream &data) {
|
|||||||
_reset();
|
_reset();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (_progress_callback) {
|
|
||||||
_progress_callback(0, _size);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(_ledPin != -1) {
|
if(_ledPin != -1) {
|
||||||
pinMode(_ledPin, OUTPUT);
|
pinMode(_ledPin, OUTPUT);
|
||||||
@ -352,12 +355,6 @@ size_t UpdateClass::writeStream(Stream &data) {
|
|||||||
if((_bufferLen == remaining() || _bufferLen == SPI_FLASH_SEC_SIZE) && !_writeBuffer())
|
if((_bufferLen == remaining() || _bufferLen == SPI_FLASH_SEC_SIZE) && !_writeBuffer())
|
||||||
return written;
|
return written;
|
||||||
written += toRead;
|
written += toRead;
|
||||||
if(_progress_callback) {
|
|
||||||
_progress_callback(_progress, _size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(_progress_callback) {
|
|
||||||
_progress_callback(_size, _size);
|
|
||||||
}
|
}
|
||||||
return written;
|
return written;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user