ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-22 13:10:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove recursive calling when fetching remote attributes.

Browse source
This commit is contained in:
h2zero 2022-02-14 20:18:18 -07:00
parent 6cda761f13
commit 99a23d3c19
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/NimBLEClient.cpp
View file

@ -620,7 +620,11 @@ NimBLERemoteService* NimBLEClient::getService(const NimBLEUUID &uuid) {
{ {
NimBLEUUID uuid128(uuid); NimBLEUUID uuid128(uuid);
uuid128.to128(); uuid128.to128();
return getService(uuid128); if(retrieveServices(&uuid128)) {
if(m_servicesVector.size() > prev_size) {
return m_servicesVector.back();
}
}
} else { } else {
// If the request was successful but the 128 bit uuid not found // If the request was successful but the 128 bit uuid not found
// try again with the 16 bit uuid. // try again with the 16 bit uuid.
@ -628,7 +632,11 @@ NimBLERemoteService* NimBLEClient::getService(const NimBLEUUID &uuid) {
uuid16.to16(); uuid16.to16();
// if the uuid was 128 bit but not of the BLE base type this check will fail // if the uuid was 128 bit but not of the BLE base type this check will fail
if (uuid16.bitSize() == BLE_UUID_TYPE_16) { if (uuid16.bitSize() == BLE_UUID_TYPE_16) {
return getService(uuid16); if(retrieveServices(&uuid16)) {
if(m_servicesVector.size() > prev_size) {
return m_servicesVector.back();
}
}
} }
} }
} }

12
src/NimBLERemoteCharacteristic.cpp
View file

@ -323,7 +323,11 @@ NimBLERemoteDescriptor* NimBLERemoteCharacteristic::getDescriptor(const NimBLEUU
{ {
NimBLEUUID uuid128(uuid); NimBLEUUID uuid128(uuid);
uuid128.to128(); uuid128.to128();
return getDescriptor(uuid128); if(retrieveDescriptors(&uuid128)) {
if(m_descriptorVector.size() > prev_size) {
return m_descriptorVector.back();
}
}
} else { } else {
// If the request was successful but the 128 bit uuid not found // If the request was successful but the 128 bit uuid not found
// try again with the 16 bit uuid. // try again with the 16 bit uuid.
@ -331,7 +335,11 @@ NimBLERemoteDescriptor* NimBLERemoteCharacteristic::getDescriptor(const NimBLEUU
uuid16.to16(); uuid16.to16();
// if the uuid was 128 bit but not of the BLE base type this check will fail // if the uuid was 128 bit but not of the BLE base type this check will fail
if (uuid16.bitSize() == BLE_UUID_TYPE_16) { if (uuid16.bitSize() == BLE_UUID_TYPE_16) {
return getDescriptor(uuid16); if(retrieveDescriptors(&uuid16)) {
if(m_descriptorVector.size() > prev_size) {
return m_descriptorVector.back();
}
}
} }
} }
} }

12
src/NimBLERemoteService.cpp
View file

@ -116,7 +116,11 @@ NimBLERemoteCharacteristic* NimBLERemoteService::getCharacteristic(const NimBLEU
{ {
NimBLEUUID uuid128(uuid); NimBLEUUID uuid128(uuid);
uuid128.to128(); uuid128.to128();
return getCharacteristic(uuid128); if (retrieveCharacteristics(&uuid128)) {
if(m_characteristicVector.size() > prev_size) {
return m_characteristicVector.back();
}
}
} else { } else {
// If the request was successful but the 128 bit uuid not found // If the request was successful but the 128 bit uuid not found
// try again with the 16 bit uuid. // try again with the 16 bit uuid.
@ -124,7 +128,11 @@ NimBLERemoteCharacteristic* NimBLERemoteService::getCharacteristic(const NimBLEU
uuid16.to16(); uuid16.to16();
// if the uuid was 128 bit but not of the BLE base type this check will fail // if the uuid was 128 bit but not of the BLE base type this check will fail
if (uuid16.bitSize() == BLE_UUID_TYPE_16) { if (uuid16.bitSize() == BLE_UUID_TYPE_16) {
return getCharacteristic(uuid16); if(retrieveCharacteristics(&uuid16)) {
if(m_characteristicVector.size() > prev_size) {
return m_characteristicVector.back();
}
}
} }
} }
} }