Merge commit 'b232e7f5f0e87f36afbc2f4e03a2c49c48dd47bc'

1 files changed, 38 insertions, 19 deletions

diff --git a/sensor/patchedBLE/src/BLEServer.h b/sensor/patchedBLE/src/BLEServer.h
index 95c55d5..d39d8bf 100644
--- a/sensor/patchedBLE/src/BLEServer.h
+++ b/sensor/patchedBLE/src/BLEServer.h
@@ -13,6 +13,7 @@
 
 #include <string>
 #include <string.h>
+// #include "BLEDevice.h"
 
 #include "BLEUUID.h"
 #include "BLEAdvertising.h"
@@ -20,8 +21,15 @@
 #include "BLEService.h"
 #include "BLESecurity.h"
 #include "FreeRTOS.h"
+#include "BLEAddress.h"
 
 class BLEServerCallbacks;
+/* TODO possibly refactor this struct */ 
+typedef struct {
+	void *peer_device;		// peer device BLEClient or BLEServer - maybe its better to have 2 structures or union here
+	bool connected;			// do we need it?
+	uint16_t mtu;			// every peer device negotiate own mtu
+} conn_status_t;
 
 
 /**
@@ -31,11 +39,8 @@ class BLEServiceMap {
 public:
 	BLEService* getByHandle(uint16_t handle);
 	BLEService* getByUUID(const char* uuid);	
-	BLEService* getByUUID(BLEUUID uuid);
-	void        handleGATTServerEvent(
-		esp_gatts_cb_event_t      event,
-		esp_gatt_if_t             gatts_if,
-		esp_ble_gatts_cb_param_t* param);
+	BLEService* getByUUID(BLEUUID uuid, uint8_t inst_id = 0);
+	void        handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t* param);
 	void        setByHandle(uint16_t handle, BLEService* service);
 	void        setByUUID(const char* uuid, BLEService* service);
 	void        setByUUID(BLEUUID uuid, BLEService* service);
@@ -43,6 +48,7 @@ public:
 	BLEService* getFirst();
 	BLEService* getNext();
 	void 		removeService(BLEService *service);
+	int 		getRegisteredServiceCount();
 
 private:
 	std::map<uint16_t, BLEService*>    m_handleMap;
@@ -62,7 +68,21 @@ public:
 	BLEAdvertising* getAdvertising();
 	void            setCallbacks(BLEServerCallbacks* pCallbacks);
 	void            startAdvertising();
-	void 			removeService(BLEService *service);
+	void 			removeService(BLEService* service);
+	BLEService* 	getServiceByUUID(const char* uuid);
+	BLEService* 	getServiceByUUID(BLEUUID uuid);
+	bool 			connect(BLEAddress address);
+	uint16_t		m_appId;
+	void			updateConnParams(esp_bd_addr_t remote_bda, uint16_t minInterval, uint16_t maxInterval, uint16_t latency, uint16_t timeout);
+
+	/* multi connection support */
+	std::map<uint16_t, conn_status_t> getPeerDevices(bool client);
+	void addPeerDevice(void* peer, bool is_client, uint16_t conn_id);
+	void removePeerDevice(uint16_t conn_id, bool client);
+	BLEServer* getServerByConnId(uint16_t conn_id);
+	void updatePeerMTU(uint16_t connId, uint16_t mtu);
+	uint16_t getPeerMTU(uint16_t conn_id);
+	uint16_t        getConnId();
 
 
 private:
@@ -71,22 +91,22 @@ private:
 	friend class BLECharacteristic;
 	friend class BLEDevice;
 	esp_ble_adv_data_t  m_adv_data;
-	uint16_t            m_appId;
-	BLEAdvertising      m_bleAdvertising;
-  uint16_t						m_connId;
-  uint32_t            m_connectedCount;
-  uint16_t            m_gatts_if;
-	FreeRTOS::Semaphore m_semaphoreRegisterAppEvt = FreeRTOS::Semaphore("RegisterAppEvt");
-	FreeRTOS::Semaphore m_semaphoreCreateEvt = FreeRTOS::Semaphore("CreateEvt");
+	// BLEAdvertising      m_bleAdvertising;
+	uint16_t			m_connId;
+	uint32_t            m_connectedCount;
+	uint16_t            m_gatts_if;
+  	std::map<uint16_t, conn_status_t> m_connectedServersMap;
+
+	FreeRTOS::Semaphore m_semaphoreRegisterAppEvt 	= FreeRTOS::Semaphore("RegisterAppEvt");
+	FreeRTOS::Semaphore m_semaphoreCreateEvt 		= FreeRTOS::Semaphore("CreateEvt");
+	FreeRTOS::Semaphore m_semaphoreOpenEvt   		= FreeRTOS::Semaphore("OpenEvt");
 	BLEServiceMap       m_serviceMap;
-	BLEServerCallbacks* m_pServerCallbacks;
+	BLEServerCallbacks* m_pServerCallbacks = nullptr;
 
 	void            createApp(uint16_t appId);
-	uint16_t        getConnId();
 	uint16_t        getGattsIf();
-	void            handleGAPEvent(esp_gap_ble_cb_event_t event,	esp_ble_gap_cb_param_t *param);
 	void            handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
-	void            registerApp();
+	void            registerApp(uint16_t);
 }; // BLEServer
 
 
@@ -104,7 +124,7 @@ public:
 	 * @param [in] pServer A reference to the %BLE server that received the client connection.
 	 */
 	virtual void onConnect(BLEServer* pServer);
-
+	virtual void onConnect(BLEServer* pServer, esp_ble_gatts_cb_param_t *param);
 	/**
 	 * @brief Handle an existing client disconnection.
 	 *
@@ -116,6 +136,5 @@ public:
 }; // BLEServerCallbacks
 
 
-
 #endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_CPP_UTILS_BLESERVER_H_ */