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: compatibility with NimBLE-Arduino 2.1.x

Browse Source
This commit is contained in:
Yurii
2024-12-17 11:24:49 +03:00
parent b6c80f355f
commit 2e3b38e14f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/SensorsTask.h
View File

@@ -380,7 +380,7 @@ protected:
void pollingBleSensors() { void pollingBleSensors() {
#if USE_BLE #if USE_BLE
if (!NimBLEDevice::getInitialized() && millis() > 5000) { if (!NimBLEDevice::isInitialized() && millis() > 5000) {
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized")); Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
BLEDevice::init(""); BLEDevice::init("");
NimBLEDevice::setPower(ESP_PWR_LVL_P9); NimBLEDevice::setPower(ESP_PWR_LVL_P9);
@@ -445,7 +445,7 @@ protected:
bool connectToBleDevice(const uint8_t sensorId) { bool connectToBleDevice(const uint8_t sensorId) {
#if USE_BLE #if USE_BLE
if (!NimBLEDevice::getInitialized()) { if (!NimBLEDevice::isInitialized()) {
return false; return false;
} }
@@ -460,7 +460,7 @@ protected:
sSensor.address[0], sSensor.address[1], sSensor.address[2], sSensor.address[0], sSensor.address[1], sSensor.address[2],
sSensor.address[3], sSensor.address[4], sSensor.address[5] sSensor.address[3], sSensor.address[4], sSensor.address[5]
}; };
const NimBLEAddress address = NimBLEAddress(addr); const auto address = NimBLEAddress(addr, 0);
NimBLEClient* pClient = nullptr; NimBLEClient* pClient = nullptr;
pClient = NimBLEDevice::getClientByPeerAddress(address); pClient = NimBLEDevice::getClientByPeerAddress(address);
@@ -470,12 +470,13 @@ protected:
} }
if (pClient == nullptr) { if (pClient == nullptr) {
if (NimBLEDevice::getClientListSize() >= NIMBLE_MAX_CONNECTIONS) { if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
return false; return false;
} }
pClient = NimBLEDevice::createClient(); pClient = NimBLEDevice::createClient();
pClient->setConnectTimeout(5); pClient->setConnectTimeout(5000);
pClient->setSelfDelete(false, true);
} }
if(pClient->isConnected()) { if(pClient->isConnected()) {
@@ -492,7 +493,6 @@ protected:
sensorId, sSensor.name, address.toString().c_str() sensorId, sSensor.name, address.toString().c_str()
); );
NimBLEDevice::deleteClient(pClient);
return false; return false;
} }
@@ -536,7 +536,7 @@ protected:
return; return;
} }
NimBLERemoteService* pService = pChar->getRemoteService(); const NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) { if (pService == nullptr) {
return; return;
} }
@@ -609,7 +609,7 @@ protected:
return; return;
} }
NimBLERemoteService* pService = pChar->getRemoteService(); const NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) { if (pService == nullptr) {
return; return;
} }
@@ -694,7 +694,7 @@ protected:
return; return;
} }
NimBLERemoteService* pService = pChar->getRemoteService(); const NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) { if (pService == nullptr) {
return; return;
} }
@@ -793,7 +793,7 @@ protected:
return; return;
} }
NimBLERemoteService* pService = pChar->getRemoteService(); const NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) { if (pService == nullptr) {
return; return;
} }