From 8fa440810c13fa232f4f1a2cd3472d31a01ef143 Mon Sep 17 00:00:00 2001 From: Yurii Date: Wed, 5 Mar 2025 02:28:17 +0300 Subject: [PATCH] refactor: status BLE sensors --- src/SensorsTask.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/SensorsTask.h b/src/SensorsTask.h index 18e9b3d..cba050e 100644 --- a/src/SensorsTask.h +++ b/src/SensorsTask.h @@ -496,9 +496,8 @@ protected: } } - if (!rSensor.connected) { - rSensor.connected = true; - } + // Mark connected + Sensors::setConnectionStatusById(sensorId, true, true); if (!this->bleLastSetDtTime[sensorId] || millis() - this->bleLastSetDtTime[sensorId] > this->bleSetDtInterval) { struct tm ti; @@ -521,7 +520,6 @@ protected: this->bleLastSetDtTime[sensorId] = millis(); } - } } } @@ -981,16 +979,16 @@ protected: auto& rSensor = Sensors::results[sensorId]; if (rSensor.connected && !sSensor.enabled) { - rSensor.connected = false; + Sensors::setConnectionStatusById(sensorId, false, false); } else if (rSensor.connected && sSensor.type == Sensors::Type::NOT_CONFIGURED) { - rSensor.connected = false; + Sensors::setConnectionStatusById(sensorId, false, false); } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) { - rSensor.connected = false; + Sensors::setConnectionStatusById(sensorId, false, false); } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) { - rSensor.connected = false; + Sensors::setConnectionStatusById(sensorId, false, false); }/* else if (!rSensor.connected) { rSensor.connected = true;