aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 02:52:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cancel update when cancel button is pressed.

Browse source
This commit is contained in:
Robert Strouse 2023-10-19 15:25:00 -07:00
parent 51f7a0700b
commit f1386011c3
3 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GitOTA.cpp
View file

@ -265,7 +265,7 @@ bool GitUpdater::beginUpdate(const char *version) {
this->cancelled = false; this->cancelled = false;
this->error = 0; this->error = 0;
this->error = this->downloadFile(); this->error = this->downloadFile();
if(this->error == 0) { if(this->error == 0 && !this->cancelled) {
strcpy(this->currentFile, "SomfyController.littlefs.bin"); strcpy(this->currentFile, "SomfyController.littlefs.bin");
this->partition = U_SPIFFS; this->partition = U_SPIFFS;
this->error = this->downloadFile(); this->error = this->downloadFile();

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

1
Web.cpp
View file

@ -954,6 +954,7 @@ void Web::begin() {
JsonObject sobj = sdoc.to<JsonObject>(); JsonObject sobj = sdoc.to<JsonObject>();
git.status = GIT_UPDATE_CANCELLING; git.status = GIT_UPDATE_CANCELLING;
git.toJSON(sobj); git.toJSON(sobj);
git.cancelled = true;
serializeJson(sdoc, g_content); serializeJson(sdoc, g_content);
server.send(200, _encoding_json, g_content); server.send(200, _encoding_json, g_content);
}); });