Compare commits

..

No commits in common. "13779cc9d726f66d8dee21d0ebec9f72dff1508a" and "4475d212187ca11c3ba076edf5e67559438d3ddf" have entirely different histories.

12 changed files with 12 additions and 31 deletions

View File

@ -1,16 +1,5 @@
# Changelog
## [1.2.68] - 2025-02-20
### Added
- add task handles for BambuMqttTask and ScaleTask; rename stopTasks to stopAllTasks
### Changed
- update webpages for version v1.2.68
### Fixed
- update stopAllTasks to suspend RfidReaderTask instead of NfcTask
## [1.2.67] - 2025-02-20
### Added
- improve OTA upload handling and add SPIFFS update support

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text">
<h1>FilaMan<span class="version">v1.2.68</span></h1>
<h1>FilaMan<span class="version">v1.2.67</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

View File

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

View File

@ -36,5 +36,4 @@ void mqtt_loop(void * parameter);
bool setBambuSpool(String payload);
void bambu_restart();
extern TaskHandle_t BambuMqttTask;
#endif

View File

@ -3,20 +3,14 @@
#include <Update.h>
#include <SPIFFS.h>
#include "commonFS.h"
#include "bambu.h"
#include "scale.h"
#include "nfc.h"
// Magic byte patterns für verschiedene Image-Typen
const uint8_t FIRMWARE_MAGIC = 0xE9;
const uint8_t ESP_MAGIC = 0xE9;
void stopAllTasks() {
void stopTasks() {
// Stop all tasks
vTaskSuspend(RfidReaderTask);
vTaskSuspend(BambuMqttTask);
vTaskSuspend(ScaleTask);
//vTaskDelay(100 / portTICK_PERIOD_MS);
vTaskSuspend(NULL);
}
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
@ -27,7 +21,8 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
static size_t spiffsSize = 0;
static const uint32_t SPIFFS_START = 0x310000; // SPIFFS start in full.bin
stopAllTasks();
stopTasks();
vTaskDelay(100 / portTICK_PERIOD_MS);
if (!index) {
// Reset static variables

View File

@ -15,6 +15,4 @@ extern uint8_t weigthCouterToApi;
extern uint8_t scale_tare_counter;
extern uint8_t pauseMainTask;
extern TaskHandle_t ScaleTask;
#endif