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

fix: fixed crash if BLE service not found #88

Browse Source
This commit is contained in:
Yurii
2024-10-31 05:25:34 +03:00
parent f86857c279
commit c03df67900
1 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
src/SensorsTask.h
View File

@@ -186,24 +186,25 @@ protected:
} }
if (!pClient->connect(address)) { if (!pClient->connect(address)) {
Log.swarningln(FPSTR(L_SENSORS_BLE), "Device %s: failed connecting", address.toString().c_str()); Log.swarningln(FPSTR(L_SENSORS_BLE), F("Device %s: failed connecting"), address.toString().c_str());
NimBLEDevice::deleteClient(pClient); NimBLEDevice::deleteClient(pClient);
return false; return false;
} }
Log.sinfoln(FPSTR(L_SENSORS_BLE), "Device %s: connected", address.toString().c_str()); Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Device %s: connected"), address.toString().c_str());
NimBLERemoteService* pService = nullptr; NimBLERemoteService* pService = nullptr;
NimBLERemoteCharacteristic* pChar = nullptr; NimBLERemoteCharacteristic* pChar = nullptr;
// ENV Service (0x181A) // ENV Service (0x181A)
pService = pClient->getService(NimBLEUUID((uint16_t) 0x181AU)); NimBLEUUID serviceUuid((uint16_t) 0x181AU);
pService = pClient->getService(serviceUuid);
if (!pService) { if (!pService) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: failed to find env service (%s)"), F("Device %s: failed to find env service (%s)"),
address.toString().c_str(), address.toString().c_str(),
pService->getUUID().toString().c_str() serviceUuid.toString().c_str()
); );
} else { } else {
@@ -211,25 +212,38 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: found env service (%s)"), F("Device %s: found env service (%s)"),
address.toString().c_str(), address.toString().c_str(),
pService->getUUID().toString().c_str() serviceUuid.toString().c_str()
); );
// 0x2A6E - Notify temperature x0.01C (pvvx) // 0x2A6E - Notify temperature x0.01C (pvvx)
bool tempNotifyCreated = false; bool tempNotifyCreated = false;
if (!tempNotifyCreated) { if (!tempNotifyCreated) {
pChar = pService->getCharacteristic(NimBLEUUID((uint16_t) 0x2A6E)); NimBLEUUID charUuid((uint16_t) 0x2A6E);
pChar = pService->getCharacteristic(charUuid);
if (pChar && pChar->canNotify()) { if (pChar && pChar->canNotify()) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: found temperature char (%s) in env service"), F("Device %s: found temperature char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
tempNotifyCreated = pChar->subscribe(true, [pTemperature](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) { tempNotifyCreated = pChar->subscribe(true, [pTemperature](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
NimBLEClient* pClient = pChar->getRemoteService()->getClient(); if (pChar == nullptr) {
return;
}
NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) {
return;
}
NimBLEClient* pClient = pService->getClient();
if (pClient == nullptr) {
return;
}
if (length != 2) { if (length != 2) {
Log.swarningln( Log.swarningln(
@@ -264,7 +278,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: subscribed to temperature char (%s) in env service"), F("Device %s: subscribed to temperature char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} else { } else {
@@ -272,7 +286,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: failed to subscribe to temperature char (%s) in env service"), F("Device %s: failed to subscribe to temperature char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} }
} }
@@ -281,18 +295,31 @@ protected:
// 0x2A1F - Notify temperature x0.1C (atc1441/pvvx) // 0x2A1F - Notify temperature x0.1C (atc1441/pvvx)
if (!tempNotifyCreated) { if (!tempNotifyCreated) {
pChar = pService->getCharacteristic(NimBLEUUID((uint16_t) 0x2A1F)); NimBLEUUID charUuid((uint16_t) 0x2A1F);
pChar = pService->getCharacteristic(charUuid);
if (pChar && pChar->canNotify()) { if (pChar && pChar->canNotify()) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: found temperature char (%s) in env service"), F("Device %s: found temperature char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
tempNotifyCreated = pChar->subscribe(true, [pTemperature](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) { tempNotifyCreated = pChar->subscribe(true, [pTemperature](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
NimBLEClient* pClient = pChar->getRemoteService()->getClient(); if (pChar == nullptr) {
return;
}
NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) {
return;
}
NimBLEClient* pClient = pService->getClient();
if (pClient == nullptr) {
return;
}
if (length != 2) { if (length != 2) {
Log.swarningln( Log.swarningln(
@@ -327,7 +354,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: subscribed to temperature char (%s) in env service"), F("Device %s: subscribed to temperature char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} else { } else {
@@ -335,7 +362,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: failed to subscribe to temperature char (%s) in env service"), F("Device %s: failed to subscribe to temperature char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} }
} }
@@ -357,18 +384,31 @@ protected:
if (pHumidity != nullptr) { if (pHumidity != nullptr) {
bool humidityNotifyCreated = false; bool humidityNotifyCreated = false;
if (!humidityNotifyCreated) { if (!humidityNotifyCreated) {
pChar = pService->getCharacteristic(NimBLEUUID((uint16_t) 0x2A6F)); NimBLEUUID charUuid((uint16_t) 0x2A6F);
pChar = pService->getCharacteristic(charUuid);
if (pChar && pChar->canNotify()) { if (pChar && pChar->canNotify()) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: found humidity char (%s) in env service"), F("Device %s: found humidity char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
humidityNotifyCreated = pChar->subscribe(true, [pHumidity](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) { humidityNotifyCreated = pChar->subscribe(true, [pHumidity](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
NimBLEClient* pClient = pChar->getRemoteService()->getClient(); if (pChar == nullptr) {
return;
}
NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) {
return;
}
NimBLEClient* pClient = pService->getClient();
if (pClient == nullptr) {
return;
}
if (length != 2) { if (length != 2) {
Log.swarningln( Log.swarningln(
@@ -403,7 +443,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: subscribed to humidity char (%s) in env service"), F("Device %s: subscribed to humidity char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} else { } else {
@@ -411,7 +451,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: failed to subscribe to humidity char (%s) in env service"), F("Device %s: failed to subscribe to humidity char (%s) in env service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} }
} }
@@ -430,13 +470,14 @@ protected:
// Battery Service (0x180F) // Battery Service (0x180F)
if (pBattery != nullptr) { if (pBattery != nullptr) {
pService = pClient->getService(NimBLEUUID((uint16_t) 0x180F)); NimBLEUUID serviceUuid((uint16_t) 0x180F);
pService = pClient->getService(serviceUuid);
if (!pService) { if (!pService) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: failed to find battery service (%s)"), F("Device %s: failed to find battery service (%s)"),
address.toString().c_str(), address.toString().c_str(),
pService->getUUID().toString().c_str() serviceUuid.toString().c_str()
); );
} else { } else {
@@ -444,24 +485,37 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: found battery service (%s)"), F("Device %s: found battery service (%s)"),
address.toString().c_str(), address.toString().c_str(),
pService->getUUID().toString().c_str() serviceUuid.toString().c_str()
); );
// 0x2A19 - Notify the battery charge level 0..99% (pvvx) // 0x2A19 - Notify the battery charge level 0..99% (pvvx)
bool batteryNotifyCreated = false; bool batteryNotifyCreated = false;
if (!batteryNotifyCreated) { if (!batteryNotifyCreated) {
pChar = pService->getCharacteristic(NimBLEUUID((uint16_t) 0x2A19)); NimBLEUUID charUuid((uint16_t) 0x2A19);
pChar = pService->getCharacteristic(charUuid);
if (pChar && pChar->canNotify()) { if (pChar && pChar->canNotify()) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: found battery char (%s) in battery service"), F("Device %s: found battery char (%s) in battery service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
batteryNotifyCreated = pChar->subscribe(true, [pBattery](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) { batteryNotifyCreated = pChar->subscribe(true, [pBattery](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
NimBLEClient* pClient = pChar->getRemoteService()->getClient(); if (pChar == nullptr) {
return;
}
NimBLERemoteService* pService = pChar->getRemoteService();
if (pService == nullptr) {
return;
}
NimBLEClient* pClient = pService->getClient();
if (pClient == nullptr) {
return;
}
if (length != 1) { if (length != 1) {
Log.swarningln( Log.swarningln(
@@ -496,7 +550,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: subscribed to battery char (%s) in battery service"), F("Device %s: subscribed to battery char (%s) in battery service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} else { } else {
@@ -504,7 +558,7 @@ protected:
FPSTR(L_SENSORS_BLE), FPSTR(L_SENSORS_BLE),
F("Device %s: failed to subscribe to battery char (%s) in battery service"), F("Device %s: failed to subscribe to battery char (%s) in battery service"),
address.toString().c_str(), address.toString().c_str(),
pChar->getUUID().toString().c_str() charUuid.toString().c_str()
); );
} }
} }