improved BLEServer::getServiceCount() and added parameter for optional count of default services

Donderda · Donderda · commit 693e2c93c582 · 2018-10-17T08:45:30.000+02:00
diff --git a/cpp_utils/BLEServer.cpp b/cpp_utils/BLEServer.cpp
@@ -117,9 +117,13 @@ BLEService* BLEServer::getServiceByUUID(BLEUUID uuid) {
 
 /**
  * @brief Returns the amount of services registered to this server
+ * @param [in] includeDefaultServices Add the amount of default BluetoothLE services defined by the BLE standard
  * @return The amount of registered services
  */
-int BLEServer::getServiceCount() {
+int BLEServer::getServiceCount(bool includeDefaultServices = false) {
+	if(includeDefaultServices){
+		return m_serviceMap.size() + 2;
+	}
 	return m_serviceMap.size();
 }
 
diff --git a/cpp_utils/BLEServer.h b/cpp_utils/BLEServer.h
@@ -43,7 +43,6 @@ class BLEServiceMap {
 	BLEService* getFirst();
 	BLEService* getNext();
 	void		removeService(BLEService* service);
-	int			getServiceCount();
 
 private:
 	std::map<uint16_t, BLEService*>    m_handleMap;
@@ -67,6 +66,7 @@ class BLEServer {
 	BLEService* 	getServiceByUUID(const char* uuid);
 	BLEService* 	getServiceByUUID(BLEUUID uuid);
 	void			removeService(BLEService* service);
+	int				getServiceCount(bool includeDefaultServices = false);
 
 private:
 	BLEServer();
