diff --git a/CHANGELOG.md b/CHANGELOG.md index 68bf7bc..1a38bfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,46 @@ # 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 + +### Fixed +- remove debug logging from checkSpoolmanInstance function + + +## [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 + +### 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 + +### 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 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/platformio.ini b/platformio.ini index d00be85..3fee01c 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.12" to_old_version = "1.5.0" ## @@ -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 diff --git a/src/api.cpp b/src/api.cpp index bbf0faf..8268efb 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -1004,9 +1004,10 @@ bool checkSpoolmanInstance() { Serial.println("Error contacting spoolman instance! HTTP Code: " + String(httpCode)); } http.end(); - returnValue = false; spoolmanApiState = API_IDLE; - }else{ + } + else + { // If the check is skipped, return the previous status Serial.println("Skipping spoolman healthcheck, API is active."); returnValue = spoolmanConnected; 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