1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00

inlining and enchancements

This commit is contained in:
John Doe
2015-07-03 22:31:10 +03:00
committed by Ivan Grokhotkov
parent 0d969e9760
commit 7596ed0742
3 changed files with 13 additions and 9 deletions

View File

@ -44,6 +44,7 @@ class UpdaterClass {
or there is an error or there is an error
this will clear everything and return false this will clear everything and return false
the last error is available through getError() the last error is available through getError()
evenIfRemaining is helpfull when you update without knowing the final size first
*/ */
bool end(bool evenIfRemaining = false); bool end(bool evenIfRemaining = false);
@ -53,14 +54,14 @@ class UpdaterClass {
void printError(Stream &out); void printError(Stream &out);
//Helpers //Helpers
uint8_t getError(){ return _error; } inline uint8_t getError(){ return _error; }
void clearError(){ _error = UPDATE_ERROR_OK; } inline void clearError(){ _error = UPDATE_ERROR_OK; }
bool hasError(){ return _error != UPDATE_ERROR_OK; } inline bool hasError(){ return _error != UPDATE_ERROR_OK; }
bool isRunning(){ return _size > 0; } inline bool isRunning(){ return _size > 0; }
bool isFinished(){ return _currentAddress == (_startAddress + _size); } inline bool isFinished(){ return _currentAddress == (_startAddress + _size); }
size_t size(){ return _size; } inline size_t size(){ return _size; }
size_t progress(){ return _currentAddress - _startAddress; } inline size_t progress(){ return _currentAddress - _startAddress; }
size_t remaining(){ return _size - (_currentAddress - _startAddress); } inline size_t remaining(){ return _size - (_currentAddress - _startAddress); }
/* /*
Template to write from objects that expose Template to write from objects that expose

View File

@ -28,6 +28,7 @@ void setup(void){
HTTPUpload& upload = server.upload(); HTTPUpload& upload = server.upload();
if(upload.status == UPLOAD_FILE_START){ if(upload.status == UPLOAD_FILE_START){
Serial.setDebugOutput(true); Serial.setDebugOutput(true);
WiFiUDP::stopAll();
Serial.printf("Update: %s\n", upload.filename.c_str()); Serial.printf("Update: %s\n", upload.filename.c_str());
uint32_t maxSketchSpace = ((ESP.getFreeSketchSpace() + ESP.getSketchSize()) / 2) & 0xFFFFF000; uint32_t maxSketchSpace = ((ESP.getFreeSketchSpace() + ESP.getSketchSize()) / 2) & 0xFFFFF000;
if(!Update.begin(maxSketchSpace)){//start with max available size if(!Update.begin(maxSketchSpace)){//start with max available size

View File

@ -43,7 +43,9 @@ void loop() {
Serial.print(remote); Serial.print(remote);
Serial.printf(", port:%d, size:%d\n", port, size); Serial.printf(", port:%d, size:%d\n", port, size);
uint32_t startTime = millis(); uint32_t startTime = millis();
WiFiUDP::stopAll();
if(!Update.begin(size)){ if(!Update.begin(size)){
Serial.println("Update Begin Error"); Serial.println("Update Begin Error");
return; return;