aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-10-31 22:02:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: download the per-chip LittleFS image in online updates

Browse source 
Releases publish SomfyController.littlefs.<chip>.bin, but the updater asked
for SomfyController.littlefs.bin. The download 404'd and the device rebooted
into the new firmware with the old web UI.

Also: hasFS now matches per-chip images, C6 picks its own firmware file, and
recoverFilesystem() points at cjkas instead of rstrouse.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-20 20:43:00 +02:00
parent a1622e652d
commit ab7eae3d94
6 changed files with 59 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/GitOTA.cpp
View file

@ -43,7 +43,7 @@ void GitRelease::setReleaseProperty(const char *key, const char *val) {
void GitRelease::setAssetProperty(const char *key, const char *val) {
if(strcmp(key, "name") == 0) {
//Serial.println(val);
if(strstr(val, "littlefs.bin")) this->hasFS = true;
if(isFsAsset(val)) this->hasFS = true;
else if(strstr(val, "ino.esp32.bin")) {
if(strlen(this->hwVersions)) strcat(this->hwVersions, ",");
strcat(this->hwVersions, "32");
@ -353,22 +353,16 @@ void GitUpdater::emitDownloadProgress(uint8_t num, size_t total, size_t loaded,
sockEmit.loop();
webServer.loop();
}
void GitUpdater::setFirmwareFile() {
// The chip part of this board's release asset names.
static const char *chipName() {
esp_chip_info_t ci;
esp_chip_info(&ci);
switch(ci.model) {
case esp_chip_model_t::CHIP_ESP32S3:
strcpy(this->currentFile, "SomfyController.ino.esp32s3.bin");
break;
case esp_chip_model_t::CHIP_ESP32S2:
strcpy(this->currentFile, "SomfyController.ino.esp32s2.bin");
break;
case esp_chip_model_t::CHIP_ESP32C3:
strcpy(this->currentFile, "SomfyController.ino.esp32c3.bin");
break;
default:
strcpy(this->currentFile, "SomfyController.ino.esp32.bin");
break;
case esp_chip_model_t::CHIP_ESP32S3: return "esp32s3";
case esp_chip_model_t::CHIP_ESP32S2: return "esp32s2";
case esp_chip_model_t::CHIP_ESP32C3: return "esp32c3";
case esp_chip_model_t::CHIP_ESP32C6: return "esp32c6";
default: return "esp32";
}
}
@ -379,14 +373,14 @@ bool GitUpdater::beginUpdate(const char *version) {
strcpy(this->targetRelease, version);
this->emitUpdateCheck();
this->setFirmwareFile();
releaseAssetName(this->currentFile, sizeof(this->currentFile), "ino", chipName());
this->partition = U_FLASH;
this->lockFS = this->cancelled = false;
this->error = 0;
this->error = this->downloadFile();
if(this->error == 0 && !this->cancelled) {
somfy.commit();
strcpy(this->currentFile, "SomfyController.littlefs.bin");
releaseAssetName(this->currentFile, sizeof(this->currentFile), "littlefs", chipName());
this->partition = U_SPIFFS;
this->lockFS = true;
this->error = this->downloadFile();
@ -405,8 +399,8 @@ bool GitUpdater::beginUpdate(const char *version) {
return true;
}
bool GitUpdater::recoverFilesystem() {
sprintf(this->baseUrl, "https://github.com/rstrouse/ESPSomfy-RTS/releases/download/%s/", settings.fwVersion.name);
strcpy(this->currentFile, "SomfyController.littlefs.bin");
sprintf(this->baseUrl, "https://github.com/cjkas/ESPSomfy-RTS/releases/download/%s/", settings.fwVersion.name);
releaseAssetName(this->currentFile, sizeof(this->currentFile), "littlefs", chipName());
this->status = GIT_UPDATING;
this->partition = U_SPIFFS;
this->lockFS = true;