diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c0f31b7..ca8bb11 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ env: ARDUINO_CLI_VERSION: "0.x" ARDUINO_ESP32_VERSION: "2.0.11" ARDUINO_JSON_VERSION: "6.21.3" - ESPTOOL_VERSION: "4.6" + ESPTOOL_VERSION: "4.7" LITTLEFS_VERSION: "v2.5.1" MKLITTLEFS_VERSION: "3.1.0" PUB_SUB_CLIENT_VERSION: "2.8.0" @@ -83,7 +83,7 @@ jobs: - board: esp32 addr_bootloader: 0x1000 chip: ESP32 - fqbn: esp32:esp32:esp32wrover:FlashMode=qio,FlashFreq=80,DebugLevel=none + fqbn: esp32:esp32:esp32:FlashMode=qio,FlashFreq=80,DebugLevel=none # esp32:esp32:esp32wrover:PartitionScheme=default,FlashMode=qio,FlashFreq=80,UploadSpeed=921600,DebugLevel=none,EraseFlash=none name: ESP32 obname: SomfyController.onboard.esp32.bin diff --git a/GitOTA.cpp b/GitOTA.cpp index 8f0a287..897d294 100644 --- a/GitOTA.cpp +++ b/GitOTA.cpp @@ -374,6 +374,7 @@ bool GitUpdater::beginUpdate(const char *version) { this->error = this->downloadFile(); if(this->error == 0) { settings.fwVersion.parse(version); + Serial.println("Committing Configuration..."); somfy.commit(); rebootDelay.reboot = true; rebootDelay.rebootTime = millis() + 500; @@ -433,7 +434,6 @@ int8_t GitUpdater::downloadFile() { https.end(); return -(Update.getError() + UPDATE_ERR_OFFSET); } - // Calculate the percentage. uint8_t p = (uint8_t)floor(((float)total / (float)len) * 100.0f); if(p != pct) { @@ -448,7 +448,7 @@ int8_t GitUpdater::downloadFile() { Update.printError(Serial); } else { - + Serial.println("Update.end Called..."); } https.end(); } @@ -473,7 +473,7 @@ int8_t GitUpdater::downloadFile() { return httpCode; } } - https.end(); + if(https.connected()) https.end(); Serial.printf("End update %s\n", this->currentFile); } diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index 2d21fe5..457f305 100644 Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ diff --git a/data/index.js b/data/index.js index 22c0932..9211f9e 100644 --- a/data/index.js +++ b/data/index.js @@ -4069,10 +4069,10 @@ class Firmware { div.style.alignContent = 'center'; let html = `