Compare commits

..

No commits in common. "aa9e7da94b79fdbd4889da1e8985d02b47174e0d" and "84cc8beb9bd9704447057668b8b1803cd9576b4e" have entirely different histories.

6 changed files with 13 additions and 21 deletions

View File

@ -40,7 +40,7 @@ jobs:
# Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary - direct copy without header
# Create SPIFFS binary without header
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary

View File

@ -47,7 +47,7 @@ jobs:
# Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary - direct copy without header
# Create SPIFFS binary without header
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary (always)

View File

@ -1,12 +1,5 @@
# Changelog
## [1.3.56] - 2025-02-22
### Changed
- update webpages for version v1.3.56
- update header title and improve SPIFFS update error handling
- clarify comments in Gitea and GitHub release workflows
## [1.3.55] - 2025-02-22
### Changed
- update webpages for version v1.3.55

View File

@ -24,7 +24,7 @@
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version"></span></h1>
<h4>Filament Management Tool</h4>
<h4>Hollo Lollo Trollo</h4>
</div>
</div>
<nav style="display: flex; gap: 1rem;">

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.3.56"
version = "1.3.55"
#test

View File

@ -403,21 +403,20 @@ void setupWebserver(AsyncWebServer &server) {
oledShowMessage("SPIFFS Update...");
backupJsonConfigs();
// Get the actual SPIFFS partition size from ESP32
const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
if (!partition) {
restoreJsonConfigs();
String errorMsg = "SPIFFS partition not found";
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
if (!Update.begin(partition->size, command)) {
// SPIFFS update with pure binary data
if (!Update.begin((updateSize - 4), command)) { // Exclude header size
restoreJsonConfigs();
String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
return;
}
// Skip initial header completely for SPIFFS update
if (index == 0 && len >= 4) {
data += 4;
len -= 4;
updateSize -= 4;
}
} else {
oledShowMessage("Firmware Update...");
if (!Update.begin(updateSize, command)) {