jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-10 18:24:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improved work with BLE sensors

Browse Source
This commit is contained in:
Yurii
2025-10-10 05:35:57 +03:00
parent 78b5a12e90
commit cf81ff5856
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/SensorsTask.h
View File

@@ -450,13 +450,17 @@ protected:
} }
for (auto& [sensorId, pClient]: this->bleClients) { for (auto& [sensorId, pClient]: this->bleClients) {
auto& sSensor = Sensors::settings[sensorId]; if (pClient == nullptr) {
continue;
}
if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) { auto& sSensor = Sensors::settings[sensorId];
const auto sAddress = NimBLEAddress(sSensor.address, 0);
if (sAddress.isNull() || !sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
Log.sinfoln( Log.sinfoln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client, address: %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client"),
sensorId, sSensor.name, sensorId, sSensor.name
pClient->getPeerAddress().toString().c_str()
); );
NimBLEDevice::deleteClient(pClient); NimBLEDevice::deleteClient(pClient);
@@ -484,16 +488,36 @@ protected:
continue; continue;
} }
const auto address = NimBLEAddress(sSensor.address, 0);
if (address.isNull()) {
continue;
}
auto pClient = this->getBleClient(sensorId); auto pClient = this->getBleClient(sensorId);
if (pClient == nullptr) { if (pClient == nullptr) {
continue; continue;
} }
if (pClient->getPeerAddress() != address) {
if (pClient->isConnected()) {
if (!pClient->disconnect()) {
continue;
}
}
pClient->setPeerAddress(address);
}
if (!pClient->isConnected()) { if (!pClient->isConnected()) {
this->bleSubscribed[sensorId] = false; this->bleSubscribed[sensorId] = false;
this->bleLastSetDtTime[sensorId] = 0; this->bleLastSetDtTime[sensorId] = 0;
pClient->connect(true, true, true); if (pClient->connect(false, true, true)) {
Log.sinfoln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': trying connecting to %s..."),
sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
);
}
continue; continue;
} }
@@ -548,29 +572,18 @@ protected:
if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) { if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
return nullptr; return nullptr;
} }
const auto address = NimBLEAddress(sSensor.address, 0);
if (address.isNull()) {
return nullptr;
}
if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) { if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) {
return this->bleClients[sensorId]; return this->bleClients[sensorId];
} }
auto pClient = NimBLEDevice::createClient(address); auto pClient = NimBLEDevice::createClient();
if (pClient == nullptr) { if (pClient == nullptr) {
return nullptr; return nullptr;
} }
/** //pClient->setConnectionParams(BLE_GAP_CONN_ITVL_MS(10), BLE_GAP_CONN_ITVL_MS(100), 10, 150);
* Set initial connection parameters: pClient->setConnectTimeout(30000);
* These settings are safe for 3 clients to connect reliably, can go faster if you have less
* connections. Timeout should be a multiple of the interval, minimum is 100ms.
* Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 1000 * 10ms = 10000ms timeout
*/
pClient->setConnectionParams(12, 12, 0, 1000);
pClient->setConnectTimeout(10000);
pClient->setSelfDelete(false, false); pClient->setSelfDelete(false, false);
pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true); pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true);