From 1eb81fad5dbc88901b4d7602aabc3dda966e724f Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:29:21 +0200 Subject: [PATCH 01/16] fix: adjust spacing in loop structure and enable tare function in scale loop --- src/main.cpp | 4 +++- src/scale.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9c757c8..fd12e8c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -171,7 +171,9 @@ void loop() { oledShowMessage("Scale not calibrated"); vTaskDelay(1000 / portTICK_PERIOD_MS); } - }else{ + } + else + { // Ausgabe der Waage auf Display if(pauseMainTask == 0) { diff --git a/src/scale.cpp b/src/scale.cpp index 201618d..24d8797 100644 --- a/src/scale.cpp +++ b/src/scale.cpp @@ -48,6 +48,8 @@ void scale_loop(void * parameter) { Serial.println("Scale Loop started"); Serial.println("++++++++++++++++++++++++++++++"); + scale.tare(); + for(;;) { if (scale.is_ready()) { @@ -120,7 +122,7 @@ void start_scale(bool touchSensorConnected) { if (scale.wait_ready_timeout(1000)) { scale.set_scale(calibrationValue); // this value is obtained by calibrating the scale with known weights; see the README for details - scale.tare(); + //scale.tare(); } // Display Gewicht From ec7386922eda7692c31539f2a8e0026aa6d98987 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:29:36 +0200 Subject: [PATCH 02/16] docs: update platformio.ini for beta version v1.5.11-beta1 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index d00be85..36dd2d5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.5.11" +version = "1.5.11-beta1" to_old_version = "1.5.0" ## From c17ab2c434de9a7bf330c50345ebcd2ede235d4e Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:29:36 +0200 Subject: [PATCH 03/16] docs: update changelog and header for version v1.5.11-beta1 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68bf7bc..ff42847 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.5.11-beta1] - 2025-08-28 +### Changed +- update platformio.ini for beta version v1.5.11-beta1 + +### Fixed +- adjust spacing in loop structure and enable tare function in scale loop + + ## [1.5.11] - 2025-08-27 ### Changed - update platformio.ini for version v1.5.11 From 99babe2b4a3a8043eeefb1bb9708b36a2f9d485c Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:45:16 +0200 Subject: [PATCH 04/16] fix: add logging for healthy spoolman instance check --- src/api.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/api.cpp b/src/api.cpp index 59da05e..2a9cb1d 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -700,6 +700,8 @@ bool checkSpoolmanInstance() { oledShowTopRow(); spoolmanConnected = true; returnValue = strcmp(status, "healthy") == 0; + Serial.print("Spoolman instance is healthy: "); + Serial.println(returnValue); }else{ spoolmanConnected = false; } From 513e02b867b86d98b49255a65d061a5ee7f6ed6d Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:45:35 +0200 Subject: [PATCH 05/16] docs: update platformio.ini for beta version v1.5.11-beta2 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 36dd2d5..85e33ee 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.5.11-beta1" +version = "1.5.11-beta2" to_old_version = "1.5.0" ## From dca9ef8d083a91e535cd78f8e11cf093b9652dae Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:45:35 +0200 Subject: [PATCH 06/16] docs: update changelog and header for version v1.5.11-beta2 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff42847..d86000e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.5.11-beta2] - 2025-08-28 +### Added +- add logging for healthy spoolman instance check + +### Changed +- update platformio.ini for beta version v1.5.11-beta2 + + ## [1.5.11-beta1] - 2025-08-28 ### Changed - update platformio.ini for beta version v1.5.11-beta1 From 83dec4c87680617dc0c396d906236d251a5800a1 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:55:24 +0200 Subject: [PATCH 07/16] feat: add logging for spoolman status in checkSpoolmanInstance function --- src/api.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/api.cpp b/src/api.cpp index 2a9cb1d..2adcec1 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -685,6 +685,8 @@ bool checkSpoolmanInstance() { if (!error && doc["status"].is()) { const char* status = doc["status"]; http.end(); + Serial.print("Spoolman status: "); + Serial.println(status); if (!checkSpoolmanExtraFields()) { Serial.println("Fehler beim Überprüfen der Extrafelder."); From c48003e1b2f8738a06df09b182e78bc14d00b0cb Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:55:30 +0200 Subject: [PATCH 08/16] docs: update platformio.ini for beta version v1.5.11-beta3 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 85e33ee..8186f55 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.5.11-beta2" +version = "1.5.11-beta3" to_old_version = "1.5.0" ## From 771b0a48392ad7c3d44e8aacfc1805ea77da5fd0 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 10:55:30 +0200 Subject: [PATCH 09/16] docs: update changelog and header for version v1.5.11-beta3 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d86000e..df77aec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.5.11-beta3] - 2025-08-28 +### Added +- add logging for spoolman status in checkSpoolmanInstance function + +### Changed +- update platformio.ini for beta version v1.5.11-beta3 + + ## [1.5.11-beta2] - 2025-08-28 ### Added - add logging for healthy spoolman instance check From 33ea062773549b8a7bd4b7105e05c467e8ae00f0 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:04:06 +0200 Subject: [PATCH 10/16] refactor: remove debug logging from checkSpoolmanInstance function --- src/api.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/api.cpp b/src/api.cpp index 2adcec1..c5e6c8c 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -685,8 +685,6 @@ bool checkSpoolmanInstance() { if (!error && doc["status"].is()) { const char* status = doc["status"]; http.end(); - Serial.print("Spoolman status: "); - Serial.println(status); if (!checkSpoolmanExtraFields()) { Serial.println("Fehler beim Überprüfen der Extrafelder."); @@ -702,8 +700,6 @@ bool checkSpoolmanInstance() { oledShowTopRow(); spoolmanConnected = true; returnValue = strcmp(status, "healthy") == 0; - Serial.print("Spoolman instance is healthy: "); - Serial.println(returnValue); }else{ spoolmanConnected = false; } @@ -717,7 +713,6 @@ bool checkSpoolmanInstance() { Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode)); } http.end(); - returnValue = false; spoolmanApiState = API_IDLE; }else{ // If the check is skipped, return the previous status From b4584364d66427f7b7ebb325f96d35158b7b1396 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:04:17 +0200 Subject: [PATCH 11/16] docs: update platformio.ini for beta version v1.5.11-beta4 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 8186f55..4927f77 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.5.11-beta3" +version = "1.5.11-beta4" to_old_version = "1.5.0" ## From 25233f70d5785e0ab695ab51d8962754a7f33ded Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:04:17 +0200 Subject: [PATCH 12/16] docs: update changelog and header for version v1.5.11-beta4 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df77aec..894f6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.5.11-beta4] - 2025-08-28 +### Changed +- update platformio.ini for beta version v1.5.11-beta4 + +### Fixed +- remove debug logging from checkSpoolmanInstance function + + ## [1.5.11-beta3] - 2025-08-28 ### Added - add logging for spoolman status in checkSpoolmanInstance function From d776956c5eaf6cc064afeaacdf4684f7d6411d84 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:10:10 +0200 Subject: [PATCH 13/16] style: add numbering to update sections in upgrade.html refactor: improve readability of checkSpoolmanInstance function --- html/upgrade.html | 4 ++-- src/api.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/html/upgrade.html b/html/upgrade.html index 70d82ee..5bbcedf 100644 --- a/html/upgrade.html +++ b/html/upgrade.html @@ -56,7 +56,7 @@
-

Firmware Update

+

1) Firmware Update

Upload a new firmware file (upgrade_filaman_firmware_*.bin)

@@ -67,7 +67,7 @@
-

Webpage Update

+

2) Webpage Update

Upload a new webpage file (upgrade_filaman_website_*.bin)

diff --git a/src/api.cpp b/src/api.cpp index c5e6c8c..c3ab4c7 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -714,7 +714,9 @@ bool checkSpoolmanInstance() { } http.end(); spoolmanApiState = API_IDLE; - }else{ + } + else + { // If the check is skipped, return the previous status Serial.println("Skipping spoolman healthcheck, API is active."); returnValue = spoolmanConnected; From 4e58407af8beff3d0f1da6c8eb40f73331a2373e Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:12:25 +0200 Subject: [PATCH 14/16] refactor: clean up library dependencies in platformio.ini --- platformio.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 4927f77..85ae95e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,10 +23,7 @@ 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 @@ -36,7 +33,6 @@ lib_deps = digitaldragon/SSLClient @ ^1.3.2 ; Enable SPIFFS upload -#board_build.filesystem = spiffs board_build.filesystem = littlefs ; Update partition settings board_build.partitions = partitions.csv From 2ac8effe04130f8d933c14ed8e5360ea024592ee Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:16:10 +0200 Subject: [PATCH 15/16] docs: update platformio.ini for version v1.5.12 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 85ae95e..3fee01c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [common] -version = "1.5.11-beta4" +version = "1.5.12" to_old_version = "1.5.0" ## From 48556b9519b1da2cf9aaceff380f7fecb9443071 Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Thu, 28 Aug 2025 11:16:10 +0200 Subject: [PATCH 16/16] docs: update changelog and header for version v1.5.12 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 894f6ae..1a38bfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.5.12] - 2025-08-28 +### Added +- add numbering to update sections in upgrade.html refactor: improve readability of checkSpoolmanInstance function + +### Changed +- update platformio.ini for version v1.5.12 +- clean up library dependencies in platformio.ini + + ## [1.5.11-beta4] - 2025-08-28 ### Changed - update platformio.ini for beta version v1.5.11-beta4