Skip to content

Updater lifetime callbacks #8653

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
Nov 3, 2022
Merged

Updater lifetime callbacks #8653

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0420f45
Updater lifetime callbacks
mcspr Jul 30, 2022
ad271fe
stringify error
mcspr Jul 30, 2022
d1a60b1
Merge remote-tracking branch 'origin/master' into ota/lifetime
mcspr Sep 12, 2022
ad9804a
Merge remote-tracking branch 'origin/master' into ota/lifetime
mcspr Nov 1, 2022
6649e66
busy
mcspr Nov 1, 2022
3d71612
type
mcspr Nov 1, 2022
6cda806
alloc error
mcspr Nov 1, 2022
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
Prev Previous commit
Next Next commit
busy
  • Loading branch information
@mcspr
mcspr committed Nov 1, 2022
commit 6649e66a063ba91ea42a97e7a2e0d4582c759cd3
49 changes: 33 additions & 16 deletions cores/esp8266/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,40 +600,57 @@ void UpdaterClass::_setError(int error){
String UpdaterClass::getErrorString() const {
String out;

if(_error == UPDATE_ERROR_OK){
switch (_error) {
case UPDATE_ERROR_OK:
out = F("No Error");
} else if(_error == UPDATE_ERROR_WRITE){
break;
case UPDATE_ERROR_WRITE:
out = F("Flash Write Failed");
} else if(_error == UPDATE_ERROR_ERASE){
break;
case UPDATE_ERROR_ERASE:
out = F("Flash Erase Failed");
} else if(_error == UPDATE_ERROR_READ){
break;
case UPDATE_ERROR_READ:
out = F("Flash Read Failed");
} else if(_error == UPDATE_ERROR_SPACE){
break;
case UPDATE_ERROR_SPACE:
out = F("Not Enough Space");
} else if(_error == UPDATE_ERROR_SIZE){
break;
case UPDATE_ERROR_SIZE:
out = F("Bad Size Given");
} else if(_error == UPDATE_ERROR_STREAM){
break;
case UPDATE_ERROR_STREAM:
out = F("Stream Read Timeout");
} else if(_error == UPDATE_ERROR_NO_DATA){
break;
case UPDATE_ERROR_NO_DATA:
out = F("No data supplied");
} else if(_error == UPDATE_ERROR_MD5){
break;
case UPDATE_ERROR_MD5:
out += F("MD5 verification failed: ");
out += F("expected: ") + _target_md5;
out += F(", calculated: ") + _md5.toString();
} else if(_error == UPDATE_ERROR_SIGN){
break;
case UPDATE_ERROR_SIGN:
out = F("Signature verification failed");
} else if(_error == UPDATE_ERROR_FLASH_CONFIG){
break;
case UPDATE_ERROR_FLASH_CONFIG:
out += F("Flash config wrong: ");
out += F("real: ") + String(ESP.getFlashChipRealSize(), 10);
out += F(", SDK: ") + String(ESP.getFlashChipSize(), 10);
} else if(_error == UPDATE_ERROR_NEW_FLASH_CONFIG){
out += F("new Flash config wrong, real size: ") + String(ESP.getFlashChipRealSize(), 10);
} else if(_error == UPDATE_ERROR_MAGIC_BYTE){
break;
case UPDATE_ERROR_NEW_FLASH_CONFIG:
out += F("new Flash config wrong, real size: ");
out += String(ESP.getFlashChipRealSize(), 10);
break;
case UPDATE_ERROR_MAGIC_BYTE:
out = F("Magic byte is not 0xE9");
} else if (_error == UPDATE_ERROR_BOOTSTRAP){
break;
case UPDATE_ERROR_BOOTSTRAP:
out = F("Invalid bootstrapping state, reset ESP8266 before updating");
} else {
break;
default:
out = F("UNKNOWN");
break;
}

return out;
Expand Down