From e1da8eb52505097eeab4aaa0b08b5668cd09f1d4 Mon Sep 17 00:00:00 2001 From: Anzarion Date: Tue, 30 Sep 2025 10:37:58 +0200 Subject: [PATCH] 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 --- src/scale.cpp | 10 +++++----- src/scale.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/scale.cpp b/src/scale.cpp index dceeddc..699df9d 100644 --- a/src/scale.cpp +++ b/src/scale.cpp @@ -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; diff --git a/src/scale.h b/src/scale.h index 5514544..aff65e1 100644 --- a/src/scale.h +++ b/src/scale.h @@ -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;