From 79f442d24b0ec574c7f9254e68b6e2c71411a521 Mon Sep 17 00:00:00 2001 From: h2zero Date: Sat, 11 Sep 2021 21:43:28 -0600 Subject: [PATCH 1/2] Add secondary service capability. --- src/NimBLEService.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++- src/NimBLEService.h | 5 +++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/NimBLEService.cpp b/src/NimBLEService.cpp index b2e5b076..987b3e49 100644 --- a/src/NimBLEService.cpp +++ b/src/NimBLEService.cpp @@ -52,6 +52,7 @@ NimBLEService::NimBLEService(const NimBLEUUID &uuid, uint16_t numHandles, NimBLE m_numHandles = numHandles; m_pSvcDef = nullptr; m_removed = 0; + m_secondary = false; } // NimBLEService @@ -130,7 +131,7 @@ bool NimBLEService::start() { ble_gatt_chr_def* pChr_a = nullptr; ble_gatt_dsc_def* pDsc_a = nullptr; - svc[0].type = BLE_GATT_SVC_TYPE_PRIMARY; + svc[0].type = m_secondary ? BLE_GATT_SVC_TYPE_SECONDARY : BLE_GATT_SVC_TYPE_PRIMARY; svc[0].uuid = &m_uuid.getNative()->u; svc[0].includes = NULL; @@ -237,6 +238,12 @@ bool NimBLEService::start() { } + if(m_secSvcVec.size() > 0){ + for(auto& it : m_secSvcVec) { + it->start(); + } + } + NIMBLE_LOGD(LOG_TAG, "<< start()"); return true; } // start @@ -251,6 +258,44 @@ uint16_t NimBLEService::getHandle() { } // getHandle +/** + * @brief Creates a BLE service as a secondary service to the service this was called from. + * @param [in] uuid The UUID of the secondary service. + * @return A reference to the new secondary service object. + */ +NimBLEService* NimBLEService::createService(const NimBLEUUID &uuid) { + NIMBLE_LOGD(LOG_TAG, ">> createService - %s", uuid.toString().c_str()); + + NimBLEServer* pServer = getServer(); + NimBLEService* pService = new NimBLEService(uuid, 0, pServer); + m_secSvcVec.push_back(pService); + pService->m_secondary = true; + pServer->serviceChanged(); + + NIMBLE_LOGD(LOG_TAG, "<< createService"); + return pService; +} + + +/** + * @brief Adds a secondary service to this service which was either already created but removed from availability,\n + * or created and later added. + * @param [in] service The secondary service object to add. + */ +void NimBLEService::addService(NimBLEService* service) { + // If adding a service that was not removed add it and return. + // Else reset GATT and send service changed notification. + if(service->m_removed == 0) { + m_secSvcVec.push_back(service); + return; + } + + service->m_secondary = true; + service->m_removed = 0; + getServer()->serviceChanged(); +} + + /** * @brief Create a new BLE Characteristic associated with this service. * @param [in] uuid - The UUID of the characteristic. diff --git a/src/NimBLEService.h b/src/NimBLEService.h index 25434284..8c7f4e30 100644 --- a/src/NimBLEService.h +++ b/src/NimBLEService.h @@ -67,6 +67,9 @@ class NimBLEService { std::vector getCharacteristics(const char* uuid); std::vector getCharacteristics(const NimBLEUUID &uuid); + void addService(NimBLEService* service); + NimBLEService* createService(const NimBLEUUID &uuid); + private: @@ -79,7 +82,9 @@ class NimBLEService { uint16_t m_numHandles; ble_gatt_svc_def* m_pSvcDef; uint8_t m_removed; + bool m_secondary; std::vector m_chrVec; + std::vector m_secSvcVec; }; // NimBLEService From 4c8a13afe4965b37118d2f11e030917514e48e85 Mon Sep 17 00:00:00 2001 From: h2zero Date: Mon, 13 Sep 2021 08:39:59 -0600 Subject: [PATCH 2/2] Add secondary services as an include on the primary. --- src/NimBLEService.cpp | 28 +++++++++++++++++++++------- src/NimBLEService.h | 1 + 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/NimBLEService.cpp b/src/NimBLEService.cpp index 987b3e49..62317713 100644 --- a/src/NimBLEService.cpp +++ b/src/NimBLEService.cpp @@ -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()"); diff --git a/src/NimBLEService.h b/src/NimBLEService.h index 8c7f4e30..1bcf9351 100644 --- a/src/NimBLEService.h +++ b/src/NimBLEService.h @@ -83,6 +83,7 @@ class NimBLEService { ble_gatt_svc_def* m_pSvcDef; uint8_t m_removed; bool m_secondary; + ble_gatt_svc_def** m_pSecSvcDef; std::vector m_chrVec; std::vector m_secSvcVec;