ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2025-01-22 17:30:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

change(Utils): Explicit template instantiation

Browse source
This commit is contained in:
thekurtovic 2025-01-16 17:57:01 -05:00
parent 0fbf7103d8
commit dbd8f1e91f
2 changed files with 51 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/NimBLEUtils.cpp
View file

@ -20,6 +20,9 @@
# include "NimBLEUtils.h" # include "NimBLEUtils.h"
# include "NimBLEAddress.h" # include "NimBLEAddress.h"
# include "NimBLERemoteService.h"
# include "NimBLERemoteDescriptor.h"
# include "NimBLERemoteCharacteristic.h"
# include "NimBLELog.h" # include "NimBLELog.h"
# if defined(CONFIG_NIMBLE_CPP_IDF) # if defined(CONFIG_NIMBLE_CPP_IDF)
@ -575,4 +578,51 @@ NimBLEAddress NimBLEUtils::generateAddr(bool nrpa) {
return NimBLEAddress{addr}; return NimBLEAddress{addr};
} // generateAddr } // generateAddr
template <typename T>
void NimBLEUtils::getAttr(const NimBLEUUID& uuid, T** attr, const std::vector<T*>& vec, const std::function<bool(const NimBLEUUID*, T**)>& getter) {
// Check if already exists.
for (const auto& v : vec) {
if (v->getUUID() == uuid) {
*attr = v;
return;
}
}
// Exit if request failed or uuid was found.
if (!getter(&uuid, attr) || *attr) {
return;
}
// Try again with 128 bit uuid if request succeeded with no uuid found.
if (uuid.bitSize() == BLE_UUID_TYPE_16 || uuid.bitSize() == BLE_UUID_TYPE_32) {
NimBLEUUID uuid128 = NimBLEUUID(uuid).to128();
getter(&uuid128, attr);
return;
}
// Try again with 16 bit uuid if request succeeded with no uuid found.
// If the uuid was 128 bit but not of the BLE base type this check will fail.
NimBLEUUID uuid16 = NimBLEUUID(uuid).to16();
if (uuid16.bitSize() == BLE_UUID_TYPE_16) {
getter(&uuid16, attr);
}
}
template void NimBLEUtils::getAttr<NimBLERemoteService>(
const NimBLEUUID&,
NimBLERemoteService**,
const std::vector<NimBLERemoteService*>&,
const std::function<bool(const NimBLEUUID*, NimBLERemoteService**)>&);
template void NimBLEUtils::getAttr<NimBLERemoteDescriptor>(
const NimBLEUUID&,
NimBLERemoteDescriptor**,
const std::vector<NimBLERemoteDescriptor*>&,
const std::function<bool(const NimBLEUUID*, NimBLERemoteDescriptor**)>&);
template void NimBLEUtils::getAttr<NimBLERemoteCharacteristic>(
const NimBLEUUID&,
NimBLERemoteCharacteristic**,
const std::vector<NimBLERemoteCharacteristic*>&,
const std::function<bool(const NimBLEUUID*, NimBLERemoteCharacteristic**)>&);
#endif // CONFIG_BT_ENABLED #endif // CONFIG_BT_ENABLED

28
src/NimBLEUtils.h
View file

@ -58,33 +58,7 @@ class NimBLEUtils {
static void taskRelease(const NimBLETaskData& taskData, int rc = 0); static void taskRelease(const NimBLETaskData& taskData, int rc = 0);
template <typename T> template <typename T>
static void getAttr(const NimBLEUUID& uuid, T** attr, const std::vector<T*>& vec, const std::function<bool(const NimBLEUUID*, T**)>& getter) { static void getAttr(const NimBLEUUID& uuid, T** attr, const std::vector<T*>& vec, const std::function<bool(const NimBLEUUID*, T**)>& getter);
// Check if already exists.
for (const auto& v : vec) {
if (v->getUUID() == uuid) {
*attr = v;
return;
}
}
// Exit if request failed or uuid was found.
if (!getter(&uuid, attr) || *attr) {
return;
}
// Try again with 128 bit uuid if request succeeded with no uuid found.
if (uuid.bitSize() == BLE_UUID_TYPE_16 || uuid.bitSize() == BLE_UUID_TYPE_32) {
NimBLEUUID uuid128 = NimBLEUUID(uuid).to128();
getter(&uuid128, attr);
return;
}
// Try again with 16 bit uuid if request succeeded with no uuid found.
// If the uuid was 128 bit but not of the BLE base type this check will fail.
NimBLEUUID uuid16 = NimBLEUUID(uuid).to16();
if (uuid16.bitSize() == BLE_UUID_TYPE_16) {
getter(&uuid16, attr);
}
}
}; };
#endif // CONFIG_BT_ENABLED #endif // CONFIG_BT_ENABLED