github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-17 21:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store upgrade progress to eeprom

Browse Source
This commit is contained in:
Gunnar Skjold
2024-11-29 11:26:00 +01:00
parent 07205b8008
commit b7c2510098
14 changed files with 272 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/SvelteUi/src/AmsWebServer.cpp
View File

@@ -418,7 +418,7 @@ void AmsWebServer::sysinfoJson() {
sys.dataCollectionConsent,
hostname.c_str(),
performRestart ? "true" : "false",
updater->getProgress() > 0.0 ? "true" : "false",
updater->getProgress() > 0.0 && upinfo.errorCode == 0 ? "true" : "false",
#if defined(ESP8266)
localIp.isSet() ? localIp.toString().c_str() : "",
subnet.isSet() ? subnet.toString().c_str() : "",
@@ -467,7 +467,6 @@ void AmsWebServer::sysinfoJson() {
ESP.getResetInfoPtr()->reason,
ESP.getResetInfoPtr()->exccause,
#endif
upinfo.exitCode,
upinfo.errorCode,
upinfo.fromVersion,
upinfo.toVersion,
@@ -1759,7 +1758,6 @@ void AmsWebServer::firmwarePost() {
if(rebootForUpgrade) {
server.send(200);
} else {
config->setUpgradeInformation(0xFF, 0xFF, FirmwareVersion::VersionString, "");
server.sendHeader(HEADER_LOCATION,F("/firmware"));
server.send(303);
}
@@ -1791,7 +1789,7 @@ debugger->printf_P(PSTR("No file, falling back to post\n"));
#endif
}
}
uploadFile(FILE_FIRMWARE);
// TODO: uploadFile(FILE_FIRMWARE);
if(upload.status == UPLOAD_FILE_END) {
rebootForUpgrade = true;
server.sendHeader(HEADER_LOCATION,F("/"));