Compare commits
22 Commits
v1.3.47
...
807eca3c43
Author | SHA1 | Date | |
---|---|---|---|
807eca3c43 | |||
b52730bf67 | |||
9a59b91e88 | |||
a5af4013d8 | |||
e54ce58ec4 | |||
142eafd232 | |||
63ab9e0993 | |||
aaa5506d40 | |||
8037adc045 | |||
6e7c728cd8 | |||
3fe8271344 | |||
f2bc6eab92 | |||
37df492339 | |||
c4b425403f | |||
73244689dd | |||
27296104d2 | |||
5f99773897 | |||
7416285fb9 | |||
85928e358d | |||
092b4fd8ec | |||
399645a2b3 | |||
164bb241b7 |
4
.github/workflows/gitea-release.yml
vendored
4
.github/workflows/gitea-release.yml
vendored
@ -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 with minimal header
|
# Create SPIFFS binary without header
|
||||||
( printf '\xe9' && cat .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
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
|
4
.github/workflows/github-release.yml
vendored
4
.github/workflows/github-release.yml
vendored
@ -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 with minimal header
|
# Create SPIFFS binary without header
|
||||||
( printf '\xe9\x01\x00\x00' && cat .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)
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
|
42
CHANGELOG.md
42
CHANGELOG.md
@ -1,5 +1,47 @@
|
|||||||
# 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
|
||||||
|
### 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 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
|
||||||
|
- update webpages for version v1.3.50
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.49] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.49
|
||||||
|
- workflow: update SPIFFS binary header to use correct chip revision
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.48] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.48
|
||||||
|
- workflow: update SPIFFS binary header for firmware release
|
||||||
|
|
||||||
|
|
||||||
## [1.3.47] - 2025-02-22
|
## [1.3.47] - 2025-02-22
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.47
|
- update webpages for version v1.3.47
|
||||||
|
@ -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>Filament Management Tool</h4>
|
<h4>Hollo Lollo Trollo</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
|
@ -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>Filament Management Tool</h4>
|
<h4>Hollo Lollo Trollo</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
|
@ -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>Filament Management Tool</h4>
|
<h4>Hollo Lollo Trollo</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
|
@ -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>Filament Management Tool</h4>
|
<h4>Hollo Lollo Trollo</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
|
@ -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>Filament Management Tool</h4>
|
<h4>Hollo Lollo Trollo</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<nav style="display: flex; gap: 1rem;">
|
<nav style="display: flex; gap: 1rem;">
|
||||||
|
@ -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>Filament Management Tool</h4>
|
<h4>Hollo Lollo Trollo</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.47"
|
version = "1.3.54"
|
||||||
|
|
||||||
#test
|
#test
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
#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"
|
||||||
|
|
||||||
@ -166,6 +165,9 @@ void sendAmsData(AsyncWebSocketClient *client) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void setupWebserver(AsyncWebServer &server) {
|
void setupWebserver(AsyncWebServer &server) {
|
||||||
|
// Deaktiviere alle Debug-Ausgaben
|
||||||
|
Serial.setDebugOutput(false);
|
||||||
|
|
||||||
// WebSocket-Optimierungen
|
// WebSocket-Optimierungen
|
||||||
ws.onEvent(onWsEvent);
|
ws.onEvent(onWsEvent);
|
||||||
ws.enable(true);
|
ws.enable(true);
|
||||||
@ -391,34 +393,35 @@ 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("spiffs") > -1) ? U_SPIFFS : U_FLASH;
|
command = (filename.indexOf("website") > -1) ? U_SPIFFS : U_FLASH;
|
||||||
|
|
||||||
if (command == U_SPIFFS) {
|
if (command == U_SPIFFS) {
|
||||||
oledShowMessage("SPIFFS Update...");
|
oledShowMessage("SPIFFS Update...");
|
||||||
backupJsonConfigs();
|
backupJsonConfigs();
|
||||||
|
|
||||||
if (!Update.begin(updateSize, command)) {
|
// SPIFFS update with pure binary data
|
||||||
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -450,12 +453,8 @@ 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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
Reference in New Issue
Block a user