Compare commits

..

26 Commits

Author SHA1 Message Date
7b52066378 docs: update changelog for version 1.3.57
All checks were successful
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m59s
2025-02-22 17:36:09 +01:00
d5afa38ded docs: update webpages for version v1.3.57 2025-02-22 17:36:09 +01:00
cf50baba2d docs: update header title to 'Filament Management Tool' in multiple HTML files 2025-02-22 17:36:02 +01:00
aa9e7da94b docs: update changelog for version 1.3.56
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m41s
2025-02-22 17:31:33 +01:00
71cd3ba4fc docs: update webpages for version v1.3.56 2025-02-22 17:31:33 +01:00
73e240e879 docs: update header title and improve SPIFFS update error handling 2025-02-22 17:31:28 +01:00
0d34e1d718 docs: clarify comments in Gitea and GitHub release workflows 2025-02-22 17:18:11 +01:00
84cc8beb9b docs: update changelog for version 1.3.55
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m38s
2025-02-22 17:00:00 +01:00
fd70e3179d docs: update webpages for version v1.3.55 2025-02-22 16:59:59 +01:00
c553640ad8 docs: update component descriptions in README files 2025-02-22 16:59:56 +01:00
807eca3c43 docs: update changelog for version 1.3.54
Some checks failed
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m12s
2025-02-22 16:47:52 +01:00
b52730bf67 docs: update webpages for version v1.3.54 2025-02-22 16:47:52 +01:00
9a59b91e88 workflow: update SPIFFS binary creation to exclude header 2025-02-22 16:47:27 +01:00
a5af4013d8 docs: update changelog for version 1.3.53
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m34s
2025-02-22 16:22:30 +01:00
e54ce58ec4 version: update to version 1.3.53 2025-02-22 16:22:27 +01:00
142eafd232 docs: update changelog for version 1.3.51 2025-02-22 16:22:04 +01:00
63ab9e0993 docs: update changelog for version 1.3.51 2025-02-22 16:21:54 +01:00
aaa5506d40 workflow: update SPIFFS binary magic byte and revert version to 1.3.51 2025-02-22 16:21:51 +01:00
8037adc045 docs: update changelog for version 1.3.52
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m20s
2025-02-22 16:09:46 +01:00
6e7c728cd8 docs: update webpages for version v1.3.52 2025-02-22 16:09:46 +01:00
3fe8271344 workflow: update SPIFFS binary creation to use correct chip revision (0xEB for Rev 3) 2025-02-22 16:09:41 +01:00
f2bc6eab92 docs: update changelog for version 1.3.51
All checks were successful
Release Workflow / detect-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m35s
2025-02-22 15:50:55 +01:00
37df492339 docs: update webpages for version v1.3.51 2025-02-22 15:50:54 +01:00
c4b425403f config: update platformio.ini to specify correct chip revision and remove unused dependencies 2025-02-22 15:50:49 +01:00
73244689dd docs: update changelog for version 1.3.50
All checks were successful
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m31s
2025-02-22 15:16:53 +01:00
27296104d2 docs: update webpages for version v1.3.50 2025-02-22 15:16:53 +01:00
14 changed files with 92 additions and 43 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 with correct chip revision # Create SPIFFS binary - direct copy without header
( printf '\xe9\x03\x01\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 # 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 with correct chip revision # Create SPIFFS binary - direct copy without header
( printf '\xe9\x03\x01\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 &&

View File

@ -1,5 +1,54 @@
# Changelog # Changelog
## [1.3.57] - 2025-02-22
### Changed
- update webpages for version v1.3.57
- update header title to 'Filament Management Tool' in multiple HTML files
## [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
- update component descriptions in README files
## [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 ## [1.3.49] - 2025-02-22
### Changed ### Changed
- update webpages for version v1.3.49 - update webpages for version v1.3.49

View File

@ -53,14 +53,14 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO
### Komponenten ### Komponenten
- **ESP32 Entwicklungsboard:** Jede ESP32-Variante. - **ESP32 Entwicklungsboard:** Jede ESP32-Variante.
[Amazon Link](https://amzn.eu/d/aXThslf) [Amazon Link](https://amzn.eu/d/aXThslf)
- **HX711 Wägezellen-Verstärker:** Für Gewichtsmessung. - **HX711 5kg Wägezellen-Verstärker:** Für Gewichtsmessung.
[Amazon Link](https://amzn.eu/d/1wZ4v0x) [Amazon Link](https://amzn.eu/d/06A0DLb)
- **OLED Display:** 128x64 SSD1306. - **OLED 0.96 Zoll I2C weiß/gelb Display:** 128x64 SSD1306.
[Amazon Link](https://amzn.eu/d/dozAYDU) [Amazon Link](https://amzn.eu/d/0AuBp2c)
- **PN532 NFC Modul:** Für NFC-Tag-Operationen. - **PN532 NFC NXP RFID-Modul V3:** Für NFC-Tag-Operationen.
[Amazon Link](https://amzn.eu/d/8205DDh) [Amazon Link](https://amzn.eu/d/jfIuQXb)
- **NFC-Tag:** NTAG215 - **NFC Tags Ntag215:** RFID Tag
[Amazon Link](https://amzn.eu/d/fywy4c4) [Amazon Link](https://amzn.eu/d/9Z6mXc1)
### Pin-Konfiguration ### Pin-Konfiguration
| Komponente | ESP32 Pin | | Komponente | ESP32 Pin |

View File

@ -56,14 +56,14 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z
### Components ### Components
- **ESP32 Development Board:** Any ESP32 variant. - **ESP32 Development Board:** Any ESP32 variant.
[Amazon Link](https://amzn.eu/d/aXThslf) [Amazon Link](https://amzn.eu/d/aXThslf)
- **HX711 Load Cell Amplifier:** For weight measurement. - **HX711 5kg Load Cell Amplifier:** For weight measurement.
[Amazon Link](https://amzn.eu/d/1wZ4v0x) [Amazon Link](https://amzn.eu/d/06A0DLb)
- **OLED Display:** 128x64 SSD1306. - **OLED 0.96 Zoll I2C white/yellow Display:** 128x64 SSD1306.
[Amazon Link](https://amzn.eu/d/dozAYDU) [Amazon Link](https://amzn.eu/d/0AuBp2c)
- **PN532 NFC Module:** For NFC tag operations. - **PN532 NFC NXP RFID-Modul V3:** For NFC tag operations.
[Amazon Link](https://amzn.eu/d/8205DDh) [Amazon Link](https://amzn.eu/d/jfIuQXb)
- **NFC-Tag:** NTAG215 - **NFC Tags Ntag215:** RFID Tag
[Amazon Link](https://amzn.eu/d/fywy4c4) [Amazon Link](https://amzn.eu/d/9Z6mXc1)
### Pin Configuration ### Pin Configuration

View File

@ -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;">

View File

@ -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;">

View File

@ -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;">

View File

@ -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;">

View File

@ -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;">

View File

@ -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;">

View File

@ -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;">

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.49" version = "1.3.57"
#test #test

View File

@ -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,25 +393,29 @@ 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)) { // 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)) {
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;
} }
} else { } else {
@ -417,8 +423,6 @@ void setupWebserver(AsyncWebServer &server) {
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 +454,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);
} }
} }
); );