Compare commits

...

11 Commits

5 changed files with 44 additions and 27 deletions

@ -40,8 +40,8 @@ jobs:
# Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with correct chip revision
( printf '\xe9\x03\x01\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create SPIFFS binary without header
cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary
(cd .pio/build/esp32dev &&

@ -47,8 +47,8 @@ jobs:
# Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with correct chip revision
( printf '\xe9\x03\x01\x00' && cat .pio/build/esp32dev/spiffs.bin ) > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create SPIFFS binary without header
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary (always)
(cd .pio/build/esp32dev &&

@ -1,10 +1,29 @@
# 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
### Changed
- version: update to version 1.3.53
- update changelog for version 1.3.51
- update changelog for version 1.3.51
- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
## [1.3.52] - 2025-02-22
### Changed
- update webpages for version v1.3.52
- workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3)
## [1.3.51] - 2025-02-22
### Changed
- update webpages for version v1.3.51
- config: update platformio.ini to specify correct chip revision and remove unused dependencies
- update changelog for version 1.3.51
- workflow: update SPIFFS binary magic byte and revert version to 1.3.51
## [1.3.50] - 2025-02-22
### Changed

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.3.51"
version = "1.3.54"
#test
@ -22,7 +22,10 @@ monitor_speed = 115200
lib_deps =
tzapu/WiFiManager @ ^2.0.17
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
#me-no-dev/AsyncTCP @ ^1.1.1
https://github.com/esphome/AsyncTCP.git
#mathieucarbou/ESPAsyncWebServer @ ^3.6.0
#esp32async/AsyncTCP @ ^3.3.5
bogde/HX711 @ ^0.7.5
adafruit/Adafruit SSD1306 @ ^2.5.13
adafruit/Adafruit GFX Library @ ^1.11.11
@ -39,10 +42,6 @@ board_upload.flash_size = 4MB
board_build.flash_mode = dio
board_upload.flash_freq = "40m"
; Specify the correct chip revision
board_build.f_cpu = 240000000L
board_build.f_flash = 80000000L
build_flags =
-Os
-ffunction-sections

@ -7,7 +7,6 @@
#include "nfc.h"
#include "scale.h"
#include "esp_task_wdt.h"
#include "esp_log.h"
#include <Update.h>
#include "display.h"
@ -166,6 +165,9 @@ void sendAmsData(AsyncWebSocketClient *client) {
}
void setupWebserver(AsyncWebServer &server) {
// Deaktiviere alle Debug-Ausgaben
Serial.setDebugOutput(false);
// WebSocket-Optimierungen
ws.onEvent(onWsEvent);
ws.enable(true);
@ -391,34 +393,35 @@ void setupWebserver(AsyncWebServer &server) {
static size_t updateSize = 0;
static int command = 0;
oledShowMessage("Upgrade please wait");
//oledShowMessage("Upgrade please wait");
if (!index) {
// Reduziere Debug-Level während des Updates
esp_log_level_set("*", ESP_LOG_ERROR);
updateSize = request->contentLength();
command = (filename.indexOf("spiffs") > -1) ? U_SPIFFS : U_FLASH;
command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH;
if (command == U_SPIFFS) {
oledShowMessage("SPIFFS Update...");
backupJsonConfigs();
if (!Update.begin(updateSize, 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 + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
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)) {
String errorMsg = String("Update begin failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return;
}
}
@ -450,12 +453,8 @@ void setupWebserver(AsyncWebServer &server) {
}
String errorMsg = String("Update end failed: ") + Update.errorString();
request->send(400, "application/json", "{\"success\":false,\"message\":\"" + errorMsg + "\"}");
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
return;
}
// Stelle Debug-Level wieder her
esp_log_level_set("*", ESP_LOG_INFO);
}
}
);