Compare commits

..

No commits in common. "3dd5fbc58563bb26c16b7c5c37d46f45ec360613" and "d92c78f9d06dba93f21dbb36201be6334dce3ff6" have entirely different histories.

10 changed files with 9 additions and 20 deletions

View File

@ -1,13 +1,5 @@
# Changelog # Changelog
## [1.2.70] - 2025-02-20
### Added
- add logging to stopAllTasks for better debugging
### Changed
- update webpages for version v1.2.70
## [1.2.69] - 2025-02-20 ## [1.2.69] - 2025-02-20
### Changed ### Changed
- update webpages for version v1.2.69 - update webpages for version v1.2.69

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<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">v1.2.70</span></h1> <h1>FilaMan<span class="version">v1.2.69</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.2.70" version = "1.2.69"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32

View File

@ -13,12 +13,10 @@ const uint8_t ESP_MAGIC = 0xE9;
void stopAllTasks() { void stopAllTasks() {
// Stop all tasks // Stop all tasks
Serial.println("Stopping all tasks");
vTaskSuspend(RfidReaderTask); vTaskSuspend(RfidReaderTask);
vTaskSuspend(BambuMqttTask); vTaskSuspend(BambuMqttTask);
vTaskSuspend(ScaleTask); vTaskSuspend(ScaleTask);
vTaskDelay(100 / portTICK_PERIOD_MS); //vTaskDelay(100 / portTICK_PERIOD_MS);
Serial.println("All tasks stopped");
} }
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
@ -31,7 +29,6 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
stopAllTasks(); stopAllTasks();
Serial.println("Start Main Upgrad Function");
if (!index) { if (!index) {
// Reset static variables // Reset static variables
if (spiffsBuffer) { if (spiffsBuffer) {