ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-23 05:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add secondary services as an include on the primary.

Browse source
This commit is contained in:
h2zero 2021-09-13 08:39:59 -06:00
parent 79f442d24b
commit 4c8a13afe4
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/NimBLEService.cpp
View file

@ -53,6 +53,7 @@ NimBLEService::NimBLEService(const NimBLEUUID &uuid, uint16_t numHandles, NimBLE
m_pSvcDef = nullptr;
m_removed = 0;
m_secondary = false;
m_pSecSvcDef = nullptr;
} // NimBLEService
@ -71,6 +72,13 @@ NimBLEService::~NimBLEService() {
delete(m_pSvcDef);
}
if(m_pSecSvcDef != nullptr) {
for(auto &it : m_secSvcVec) {
delete it;
}
delete m_pSecSvcDef;
}
for(auto &it : m_chrVec) {
delete it;
}
@ -223,6 +231,19 @@ bool NimBLEService::start() {
// end of services must indicate to api with type = 0
svc[1].type = 0;
m_pSvcDef = svc;
if(m_secSvcVec.size() > 0){
size_t numSecSvcs = m_secSvcVec.size();
ble_gatt_svc_def** m_pSecSvcDef = new ble_gatt_svc_def*[numSecSvcs + 1];
int i = 0;
for(auto& it : m_secSvcVec) {
it->start();
m_pSecSvcDef[i] = it->m_pSvcDef;
++i;
}
m_pSecSvcDef[numSecSvcs] = nullptr;
m_pSvcDef->includes = (const ble_gatt_svc_def**)m_pSecSvcDef;
}
}
int rc = ble_gatts_count_cfg((const ble_gatt_svc_def*)m_pSvcDef);
@ -235,13 +256,6 @@ bool NimBLEService::start() {
if (rc != 0) {
NIMBLE_LOGE(LOG_TAG, "ble_gatts_add_svcs, rc= %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
return false;
}
if(m_secSvcVec.size() > 0){
for(auto& it : m_secSvcVec) {
it->start();
}
}
NIMBLE_LOGD(LOG_TAG, "<< start()");

1
src/NimBLEService.h
View file

@ -83,6 +83,7 @@ private:
ble_gatt_svc_def* m_pSvcDef;
uint8_t m_removed;
bool m_secondary;
ble_gatt_svc_def** m_pSecSvcDef;
std::vector<NimBLECharacteristic*> m_chrVec;
std::vector<NimBLEService*> m_secSvcVec;