Skip to content

Commit

Permalink
Add secondary service capability.
Browse files Browse the repository at this point in the history
  • Loading branch information
h2zero committed Sep 12, 2021
1 parent 933c55c commit 8eb8f8e
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
47 changes: 46 additions & 1 deletion src/NimBLEService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions src/NimBLEService.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ class NimBLEService {
std::vector<NimBLECharacteristic*> getCharacteristics(const char* uuid);
std::vector<NimBLECharacteristic*> getCharacteristics(const NimBLEUUID &uuid);

void addService(NimBLEService* service);
NimBLEService* createService(const NimBLEUUID &uuid);


private:

Expand All @@ -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<NimBLECharacteristic*> m_chrVec;
std::vector<NimBLEService*> m_secSvcVec;

}; // NimBLEService

Expand Down

0 comments on commit 8eb8f8e

Please sign in to comment.