Compare commits
4 Commits
4475d21218
...
13779cc9d7
Author | SHA1 | Date | |
---|---|---|---|
13779cc9d7 | |||
b6d5a8a00b | |||
f6319e79f0 | |||
6f24630a7d |
11
CHANGELOG.md
11
CHANGELOG.md
@ -1,5 +1,16 @@
|
|||||||
# Changelog
|
# 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
|
## [1.2.67] - 2025-02-20
|
||||||
### Added
|
### Added
|
||||||
- improve OTA upload handling and add SPIFFS update support
|
- improve OTA upload handling and add SPIFFS update support
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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.67</span></h1>
|
<h1>FilaMan<span class="version">v1.2.68</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.2.67"
|
version = "1.2.68"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
@ -36,4 +36,5 @@ void mqtt_loop(void * parameter);
|
|||||||
bool setBambuSpool(String payload);
|
bool setBambuSpool(String payload);
|
||||||
void bambu_restart();
|
void bambu_restart();
|
||||||
|
|
||||||
|
extern TaskHandle_t BambuMqttTask;
|
||||||
#endif
|
#endif
|
||||||
|
13
src/ota.cpp
13
src/ota.cpp
@ -3,14 +3,20 @@
|
|||||||
#include <Update.h>
|
#include <Update.h>
|
||||||
#include <SPIFFS.h>
|
#include <SPIFFS.h>
|
||||||
#include "commonFS.h"
|
#include "commonFS.h"
|
||||||
|
#include "bambu.h"
|
||||||
|
#include "scale.h"
|
||||||
|
#include "nfc.h"
|
||||||
|
|
||||||
// Magic byte patterns für verschiedene Image-Typen
|
// Magic byte patterns für verschiedene Image-Typen
|
||||||
const uint8_t FIRMWARE_MAGIC = 0xE9;
|
const uint8_t FIRMWARE_MAGIC = 0xE9;
|
||||||
const uint8_t ESP_MAGIC = 0xE9;
|
const uint8_t ESP_MAGIC = 0xE9;
|
||||||
|
|
||||||
void stopTasks() {
|
void stopAllTasks() {
|
||||||
// Stop all tasks
|
// Stop all tasks
|
||||||
vTaskSuspend(NULL);
|
vTaskSuspend(RfidReaderTask);
|
||||||
|
vTaskSuspend(BambuMqttTask);
|
||||||
|
vTaskSuspend(ScaleTask);
|
||||||
|
//vTaskDelay(100 / portTICK_PERIOD_MS);
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
||||||
@ -21,8 +27,7 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
|
|||||||
static size_t spiffsSize = 0;
|
static size_t spiffsSize = 0;
|
||||||
static const uint32_t SPIFFS_START = 0x310000; // SPIFFS start in full.bin
|
static const uint32_t SPIFFS_START = 0x310000; // SPIFFS start in full.bin
|
||||||
|
|
||||||
stopTasks();
|
stopAllTasks();
|
||||||
vTaskDelay(100 / portTICK_PERIOD_MS);
|
|
||||||
|
|
||||||
if (!index) {
|
if (!index) {
|
||||||
// Reset static variables
|
// Reset static variables
|
||||||
|
@ -15,4 +15,6 @@ extern uint8_t weigthCouterToApi;
|
|||||||
extern uint8_t scale_tare_counter;
|
extern uint8_t scale_tare_counter;
|
||||||
extern uint8_t pauseMainTask;
|
extern uint8_t pauseMainTask;
|
||||||
|
|
||||||
|
extern TaskHandle_t ScaleTask;
|
||||||
|
|
||||||
#endif
|
#endif
|
Loading…
x
Reference in New Issue
Block a user