Compare commits

..

No commits in common. "807eca3c43db3bda673aa9ec6d1c03dbb8b6171a" and "a5af4013d86195dbc1418c591a327475cc14aad0" have entirely different histories.

5 changed files with 20 additions and 22 deletions

View File

@ -40,8 +40,8 @@ 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 with magic byte 0xE9
cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/upgrade_filaman_website_v${VERSION}.bin ( printf '\xe9\x03\x01\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary # Create full binary
(cd .pio/build/esp32dev && (cd .pio/build/esp32dev &&

View File

@ -47,8 +47,8 @@ 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 with magic byte 0xE9
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin ( printf '\xe9\x03\x01\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary (always) # Create full binary (always)
(cd .pio/build/esp32dev && (cd .pio/build/esp32dev &&

View File

@ -1,11 +1,5 @@
# Changelog # Changelog
## [1.3.54] - 2025-02-22
### Changed
- update webpages for version v1.3.54
- workflow: update SPIFFS binary creation to exclude header
## [1.3.53] - 2025-02-22 ## [1.3.53] - 2025-02-22
### Changed ### Changed
- version: update to version 1.3.53 - version: update to version 1.3.53

View File

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

View File

@ -7,6 +7,7 @@
#include "nfc.h" #include "nfc.h"
#include "scale.h" #include "scale.h"
#include "esp_task_wdt.h" #include "esp_task_wdt.h"
#include "esp_log.h"
#include <Update.h> #include <Update.h>
#include "display.h" #include "display.h"
@ -393,35 +394,34 @@ void setupWebserver(AsyncWebServer &server) {
static size_t updateSize = 0; static size_t updateSize = 0;
static int command = 0; static int command = 0;
//oledShowMessage("Upgrade please wait"); oledShowMessage("Upgrade please wait");
if (!index) { if (!index) {
// Reduziere Debug-Level während des Updates
esp_log_level_set("*", ESP_LOG_ERROR);
updateSize = request->contentLength(); updateSize = request->contentLength();
command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH; command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
oledShowMessage("SPIFFS Update..."); oledShowMessage("SPIFFS Update...");
backupJsonConfigs(); backupJsonConfigs();
// SPIFFS update with pure binary data if (!Update.begin(updateSize, command)) {
if (!Update.begin((updateSize - 4), command)) { // Exclude header size
restoreJsonConfigs(); restoreJsonConfigs();
String errorMsg = String("Update begin failed: ") + Update.errorString(); String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return; return;
} }
// Skip initial header completely for SPIFFS update
if (index == 0 && len >= 4) {
data += 4;
len -= 4;
updateSize -= 4;
}
} else { } else {
oledShowMessage("Firmware Update..."); oledShowMessage("Firmware Update...");
if (!Update.begin(updateSize, command)) { if (!Update.begin(updateSize, command)) {
String errorMsg = String("Update begin failed: ") + Update.errorString(); String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return; return;
} }
} }
@ -453,8 +453,12 @@ void setupWebserver(AsyncWebServer &server) {
} }
String errorMsg = String("Update end failed: ") + Update.errorString(); String errorMsg = String("Update end failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}"); request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return; return;
} }
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
} }
} }
); );