Compare commits

..

9 Commits

Author SHA1 Message Date
1b4701bf76 docs: update changelog and header for version v2.0.10
All checks were successful
Release Workflow / detect-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 4m29s
2025-10-15 16:03:13 +02:00
a2df2621e1 docs: update platformio.ini for version v2.0.10 2025-10-15 16:03:13 +02:00
74aaedd72d fix typo 2025-10-15 16:03:07 +02:00
4dff77e75d docs: update changelog and header for version v2.0.9
Some checks failed
Release Workflow / detect-provider (push) Successful in 5s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m24s
2025-10-15 15:53:44 +02:00
907765bcaa docs: update platformio.ini for version v2.0.9 2025-10-15 15:53:44 +02:00
b867aade7d docs: update changelog and header for version v2.0.8
Some checks failed
Release Workflow / detect-provider (push) Successful in 1m9s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m39s
2025-10-15 15:43:54 +02:00
36771235ad docs: update platformio.ini for version v2.0.8 2025-10-15 15:43:53 +02:00
47470eb944 Merge pull request #51 from Anzarion/main
Fix: Add NULL checks to prevent crash without RFID module
2025-10-15 15:37:20 +02:00
Anzarion
e1da8eb525 Fix: Add NULL checks to prevent crash without RFID module
- Added NULL checks before vTaskSuspend/vTaskResume in scale.cpp
- Prevents crash when calibrating without RFID module connected
- Allows scale to work as standalone device without RFID
2025-09-30 10:37:58 +02:00
5 changed files with 27 additions and 12 deletions

View File

@@ -1,5 +1,20 @@
# Changelog
## [2.0.10] - 2025-10-15
### Fixed
- fix typo
## [2.0.9] - 2025-10-15
## [2.0.8] - 2025-10-15
### Added
- Fix: Add NULL checks to prevent crash without RFID module
### Changed
- Merge pull request #51 from Anzarion/main
## [2.0.7] - 2025-09-13
### Added
- add HTTP service to mDNS responder

View File

@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "2.0.7"
version = "2.0.10"
to_old_version = "1.5.10"
##

View File

@@ -203,11 +203,11 @@ void loop() {
// Prüfen ob das Gewicht gleich bleibt und dann senden
if (abs(weight - lastWeight) <= 2 && weight > 5)
{
weigthCouterToApi++;
weightCounterToApi++;
}
else
{
weigthCouterToApi = 0;
weightCounterToApi = 0;
weightSend = 0;
}
}
@@ -215,13 +215,13 @@ void loop() {
// reset weight counter after writing tag
if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState != NFC_IDLE && nfcReaderState != NFC_READ_SUCCESS)
{
weigthCouterToApi = 0;
weightCounterToApi = 0;
}
lastWeight = weight;
// Wenn ein Tag mit SM id erkannte wurde und der Waage Counter anspricht an SM Senden
if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE)
if (activeSpoolId != "" && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE)
{
// set the current tag as processed to prevent it beeing processed again
tagProcessed = true;
@@ -248,7 +248,7 @@ void loop() {
}
// Handle successful tag write: Send weight to Spoolman but NEVER auto-send to Bambu
if (activeSpoolId != "" && weigthCouterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE)
if (activeSpoolId != "" && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false && spoolmanApiState == API_IDLE)
{
// set the current tag as processed to prevent it beeing processed again
tagProcessed = true;

View File

@@ -28,7 +28,7 @@ int16_t lastDisplayedWeight = 0;
int16_t lastStableWeight = 0; // For API/action triggering
unsigned long lastMeasurementTime = 0;
uint8_t weigthCouterToApi = 0;
uint8_t weightCounterToApi = 0;
uint8_t scale_tare_counter = 0;
bool scaleTareRequest = false;
uint8_t pauseMainTask = 0;
@@ -285,8 +285,8 @@ uint8_t calibrate_scale() {
scaleCalibrationActive = true;
vTaskSuspend(RfidReaderTask);
vTaskSuspend(ScaleTask);
if (RfidReaderTask != NULL) vTaskSuspend(RfidReaderTask);
if (ScaleTask != NULL) vTaskSuspend(ScaleTask);
pauseBambuMqttTask = true;
pauseMainTask = 1;
@@ -393,8 +393,8 @@ uint8_t calibrate_scale() {
returnState = 0;
}
vTaskResume(RfidReaderTask);
vTaskResume(ScaleTask);
if (RfidReaderTask != NULL) vTaskResume(RfidReaderTask);
if (ScaleTask != NULL) vTaskResume(ScaleTask);
pauseBambuMqttTask = false;
pauseMainTask = 0;
scaleCalibrationActive = false;

View File

@@ -18,7 +18,7 @@ int16_t getFilteredDisplayWeight();
extern HX711 scale;
extern int16_t weight;
extern uint8_t weigthCouterToApi;
extern uint8_t weightCounterToApi;
extern uint8_t scale_tare_counter;
extern uint8_t scaleTareRequest;
extern uint8_t pauseMainTask;