diff --git a/src/NimBLEService.cpp b/src/NimBLEService.cpp index b2e5b07..987b3e4 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 2543428..8c7f4e3 100644 --- a/src/NimBLEService.h +++ b/src/NimBLEService.h @@ -67,6 +67,9 @@ public: 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 @@ private: 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