Compare commits
4 Commits
84cc8beb9b
...
aa9e7da94b
Author | SHA1 | Date | |
---|---|---|---|
aa9e7da94b | |||
71cd3ba4fc | |||
73e240e879 | |||
0d34e1d718 |
2
.github/workflows/gitea-release.yml
vendored
2
.github/workflows/gitea-release.yml
vendored
@ -40,7 +40,7 @@ jobs:
|
|||||||
# Copy firmware binary
|
# Copy firmware binary
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||||
|
|
||||||
# Create SPIFFS binary without header
|
# Create SPIFFS binary - direct copy without header
|
||||||
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||||
|
|
||||||
# Create full binary
|
# Create full binary
|
||||||
|
2
.github/workflows/github-release.yml
vendored
2
.github/workflows/github-release.yml
vendored
@ -47,7 +47,7 @@ jobs:
|
|||||||
# Copy firmware binary
|
# Copy firmware binary
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||||
|
|
||||||
# Create SPIFFS binary without header
|
# Create SPIFFS binary - direct copy without header
|
||||||
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||||
|
|
||||||
# Create full binary (always)
|
# Create full binary (always)
|
||||||
|
@ -1,5 +1,12 @@
|
|||||||
# Changelog
|
# 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
|
## [1.3.55] - 2025-02-22
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.55
|
- update webpages for version v1.3.55
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version"></span></h1>
|
<h1>FilaMan<span class="version"></span></h1>
|
||||||
<h4>Hollo Lollo Trollo</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.55"
|
version = "1.3.56"
|
||||||
|
|
||||||
#test
|
#test
|
||||||
|
|
||||||
|
@ -403,19 +403,20 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
oledShowMessage("SPIFFS Update...");
|
oledShowMessage("SPIFFS Update...");
|
||||||
backupJsonConfigs();
|
backupJsonConfigs();
|
||||||
|
|
||||||
// SPIFFS update with pure binary data
|
// Get the actual SPIFFS partition size from ESP32
|
||||||
if (!Update.begin((updateSize - 4), command)) { // Exclude header size
|
const esp_partition_t *partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
|
||||||
|
if (!partition) {
|
||||||
restoreJsonConfigs();
|
restoreJsonConfigs();
|
||||||
String errorMsg = String("Update begin failed: ") + Update.errorString();
|
String errorMsg = "SPIFFS partition not found";
|
||||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip initial header completely for SPIFFS update
|
if (!Update.begin(partition->size, command)) {
|
||||||
if (index == 0 && len >= 4) {
|
restoreJsonConfigs();
|
||||||
data += 4;
|
String errorMsg = String("Update begin failed: ") + Update.errorString();
|
||||||
len -= 4;
|
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
|
||||||
updateSize -= 4;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
oledShowMessage("Firmware Update...");
|
oledShowMessage("Firmware Update...");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user