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

More messages in OTA

Browse source
This commit is contained in:
Robert Strouse 2023-12-30 20:36:29 -08:00
parent d18170b6e5
commit 0710445b27
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/release.yaml vendored
View file

@ -9,7 +9,7 @@ env:
ARDUINO_CLI_VERSION: "0.x" ARDUINO_CLI_VERSION: "0.x"
ARDUINO_ESP32_VERSION: "2.0.11" ARDUINO_ESP32_VERSION: "2.0.11"
ARDUINO_JSON_VERSION: "6.21.3" ARDUINO_JSON_VERSION: "6.21.3"
ESPTOOL_VERSION: "4.6" ESPTOOL_VERSION: "4.7"
LITTLEFS_VERSION: "v2.5.1" LITTLEFS_VERSION: "v2.5.1"
MKLITTLEFS_VERSION: "3.1.0" MKLITTLEFS_VERSION: "3.1.0"
PUB_SUB_CLIENT_VERSION: "2.8.0" PUB_SUB_CLIENT_VERSION: "2.8.0"
@ -83,7 +83,7 @@ jobs:
- board: esp32 - board: esp32
addr_bootloader: 0x1000 addr_bootloader: 0x1000
chip: ESP32 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 # esp32:esp32:esp32wrover:PartitionScheme=default,FlashMode=qio,FlashFreq=80,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
name: ESP32 name: ESP32
obname: SomfyController.onboard.esp32.bin obname: SomfyController.onboard.esp32.bin

6
GitOTA.cpp
View file

@ -374,6 +374,7 @@ bool GitUpdater::beginUpdate(const char *version) {
this->error = this->downloadFile(); this->error = this->downloadFile();
if(this->error == 0) { if(this->error == 0) {
settings.fwVersion.parse(version); settings.fwVersion.parse(version);
Serial.println("Committing Configuration...");
somfy.commit(); somfy.commit();
rebootDelay.reboot = true; rebootDelay.reboot = true;
rebootDelay.rebootTime = millis() + 500; rebootDelay.rebootTime = millis() + 500;
@ -433,7 +434,6 @@ int8_t GitUpdater::downloadFile() {
https.end(); https.end();
return -(Update.getError() + UPDATE_ERR_OFFSET); return -(Update.getError() + UPDATE_ERR_OFFSET);
} }
// Calculate the percentage. // Calculate the percentage.
uint8_t p = (uint8_t)floor(((float)total / (float)len) * 100.0f); uint8_t p = (uint8_t)floor(((float)total / (float)len) * 100.0f);
if(p != pct) { if(p != pct) {
@ -448,7 +448,7 @@ int8_t GitUpdater::downloadFile() {
Update.printError(Serial); Update.printError(Serial);
} }
else { else {
Serial.println("Update.end Called...");
} }
https.end(); https.end();
} }
@ -473,7 +473,7 @@ int8_t GitUpdater::downloadFile() {
return httpCode; return httpCode;
} }
} }
https.end(); if(https.connected()) https.end();
Serial.printf("End update %s\n", this->currentFile); Serial.printf("End update %s\n", this->currentFile);
} }

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

4
data/index.js
View file

@ -4069,10 +4069,10 @@ class Firmware {
div.style.alignContent = 'center'; div.style.alignContent = 'center';
let html = `<div>Select a version from the repository to install using the dropdown below. Then press the update button to install that version.</div><div style="font-size:.7em;margin-top:4px;">Select Main to install the most recent alpha version from the repository.</div>`; let html = `<div>Select a version from the repository to install using the dropdown below. Then press the update button to install that version.</div><div style="font-size:.7em;margin-top:4px;">Select Main to install the most recent alpha version from the repository.</div>`;
html += `<div class="field-group" style = "text-align:center;">`; html += `<div class="field-group" style = "text-align:center;">`;
html += `<select id="selVersion" data-bind="version" style="width:50%;font-size:2em;color:white;" onchange="firmware.gitReleaseSelected(document.getElementById('divGitInstall'));">` html += `<select id="selVersion" data-bind="version" style="width:70%;font-size:2em;color:white;text-align-last:center;" onchange="firmware.gitReleaseSelected(document.getElementById('divGitInstall'));">`
for (let i = 0; i < rel.releases.length; i++) { for (let i = 0; i < rel.releases.length; i++) {
if (rel.releases[i].hwVersions.length === 0 || rel.releases[i].hwVersions.indexOf(chip) >= 0) if (rel.releases[i].hwVersions.length === 0 || rel.releases[i].hwVersions.indexOf(chip) >= 0)
html += `<option style="text-align:left;font-size:.5em;color:black;" value="${rel.releases[i].version.name}">${rel.releases[i].name}</option>` html += `<option style="text-align:left;font-size:.5em;color:black;" value="${rel.releases[i].version.name}">${rel.releases[i].name}${rel.releases[i].preRelease ? ' - Pre' : ''}</option>`
} }
html += `</select><label for="selVersion">Select a version</label></div>`; html += `</select><label for="selVersion">Select a version</label></div>`;
html += `<div class="button-container" id="divReleaseNotes" style="text-align:center;margin-top:-20px;display:none;"><button type="button" onclick="firmware.showReleaseNotes(document.getElementById('selVersion').value);" style="display:inline-block;width:auto;padding-left:20px;padding-right:20px;">Release Notes</button></div>`; html += `<div class="button-container" id="divReleaseNotes" style="text-align:center;margin-top:-20px;display:none;"><button type="button" onclick="firmware.showReleaseNotes(document.getElementById('selVersion').value);" style="display:inline-block;width:auto;padding-left:20px;padding-right:20px;">Release Notes</button></div>`;