Merge pull request #789 from chegewara/master

Bugfixes

Author: chegewara

cpp_utils/BLEAdvertisedDevice.cpp

@@ -13,14 +13,16 @@
  */
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
-#include <esp_log.h>
 #include <sstream>
 #include "BLEAdvertisedDevice.h"
 #include "BLEUtils.h"
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
-#endif
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
 static const char* LOG_TAG="BLEAdvertisedDevice";
+#endif
 
 BLEAdvertisedDevice::BLEAdvertisedDevice() {
 	m_adFlag           = 0;
@@ -523,5 +525,8 @@ size_t BLEAdvertisedDevice::getPayloadLength() {
 	return m_payloadLength;
 }
 
+void BLEAdvertisedDeviceCallbacks::onResult(BLEAdvertisedDevice dev) {}
+void BLEAdvertisedDeviceCallbacks::onResult(BLEAdvertisedDevice* dev) {}
+
 #endif /* CONFIG_BT_ENABLED */
 

cpp_utils/BLEAdvertisedDevice.h

@@ -116,7 +116,8 @@ class BLEAdvertisedDeviceCallbacks {
 	 * As we are scanning, we will find new devices.  When found, this call back is invoked with a reference to the
 	 * device that was found.  During any individual scan, a device will only be detected one time.
 	 */
-	virtual void onResult(BLEAdvertisedDevice advertisedDevice) = 0;
+	virtual void onResult(BLEAdvertisedDevice advertisedDevice);
+	virtual void onResult(BLEAdvertisedDevice* advertisedDevice);
 };
 
 #endif /* CONFIG_BT_ENABLED */

cpp_utils/BLEAdvertising.cpp

@@ -19,16 +19,18 @@
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 #include "BLEAdvertising.h"
-#include <esp_log.h>
 #include <esp_err.h>
 #include "BLEUtils.h"
 #include "GeneralUtils.h"
 
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
+static const char* LOG_TAG = "BLEAdvertising";
 #endif
 
-static const char* LOG_TAG = "BLEAdvertising";
 
 
 /**

cpp_utils/BLEBeacon.cpp

@@ -7,12 +7,17 @@
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 #include <string.h>
-#include <esp_log.h>
 #include "BLEBeacon.h"
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
+#include "esp32-hal-log.h"
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
+static const char* LOG_TAG = "BLEBeacon";
+#endif
 
 #define ENDIAN_CHANGE_U16(x) ((((x)&0xFF00)>>8) + (((x)&0xFF)<<8))
 
-static const char LOG_TAG[] = "BLEBeacon";
 
 BLEBeacon::BLEBeacon() {
 	m_beaconData.manufacturerId = 0x4c00;

cpp_utils/BLECharacteristic.cpp

@@ -11,19 +11,20 @@
 #include <iomanip>
 #include <stdlib.h>
 #include "sdkconfig.h"
-#include <esp_log.h>
 #include <esp_err.h>
 #include "BLECharacteristic.h"
 #include "BLEService.h"
 #include "BLEDevice.h"
 #include "BLEUtils.h"
 #include "BLE2902.h"
 #include "GeneralUtils.h"
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
-#endif
-
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
 static const char* LOG_TAG = "BLECharacteristic";
+#endif
 
 #define NULL_HANDLE (0xffff)
 

cpp_utils/BLEClient.cpp

@@ -6,7 +6,6 @@
  */
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
-#include <esp_log.h>
 #include <esp_bt.h>
 #include <esp_bt_main.h>
 #include <esp_gap_ble_api.h>
@@ -19,10 +18,15 @@
 #include <sstream>
 #include <unordered_set>
 #include "BLEDevice.h"
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
+static const char* LOG_TAG = "BLEClient";
 #endif
 
+
 /*
  * Design
  * ------
@@ -43,14 +47,28 @@
  *
  *
  */
-static const char* LOG_TAG = "BLEClient";
 
 BLEClient::BLEClient() {
 	m_pClientCallbacks = nullptr;
 	m_conn_id          = ESP_GATT_IF_NONE;
 	m_gattc_if         = ESP_GATT_IF_NONE;
 	m_haveServices     = false;
 	m_isConnected      = false;  // Initially, we are flagged as not connected.
+
+
+	m_appId = BLEDevice::m_appId++;
+	m_appId = m_appId%100;
+	BLEDevice::addPeerDevice(this, true, m_appId);
+	m_semaphoreRegEvt.take("connect");
+
+	esp_err_t errRc = ::esp_ble_gattc_app_register(m_appId);
+	if (errRc != ESP_OK) {
+		ESP_LOGE(LOG_TAG, "esp_ble_gattc_app_register: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
+		return;
+	}
+
+	m_semaphoreRegEvt.wait("connect");
+
 } // BLEClient
 
 
@@ -60,10 +78,10 @@ BLEClient::BLEClient() {
 BLEClient::~BLEClient() {
 	// We may have allocated service references associated with this client.  Before we are finished
 	// with the client, we must release resources.
-	for (auto &myPair : m_servicesMap) {
-	   delete myPair.second;
-	}
-	m_servicesMap.clear();
+	clearServices();
+	esp_ble_gattc_app_unregister(m_gattc_if);
+	BLEDevice::removePeerDevice(m_appId, true);
+
 } // ~BLEClient
 
 
@@ -78,6 +96,7 @@ void BLEClient::clearServices() {
 	   delete myPair.second;
 	}
 	m_servicesMap.clear();
+	m_servicesMapByInstID.clear();
 	m_haveServices = false;
 	ESP_LOGD(LOG_TAG, "<< clearServices");
 } // clearServices
@@ -99,26 +118,12 @@ bool BLEClient::connect(BLEAdvertisedDevice* device) {
 bool BLEClient::connect(BLEAddress address, esp_ble_addr_type_t type) {
 	ESP_LOGD(LOG_TAG, ">> connect(%s)", address.toString().c_str());
 
-// We need the connection handle that we get from registering the application.  We register the app
-// and then block on its completion.  When the event has arrived, we will have the handle.
-	m_appId = BLEDevice::m_appId++;
-	BLEDevice::addPeerDevice(this, true, m_appId);
-	m_semaphoreRegEvt.take("connect");
-
-	// clearServices(); // we dont need to delete services since every client is unique?
-	esp_err_t errRc = ::esp_ble_gattc_app_register(m_appId);
-	if (errRc != ESP_OK) {
-		ESP_LOGE(LOG_TAG, "esp_ble_gattc_app_register: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
-		return false;
-	}
-
-	m_semaphoreRegEvt.wait("connect");
-
+	clearServices();
 	m_peerAddress = address;
 
 	// Perform the open connection request against the target BLE Server.
 	m_semaphoreOpenEvt.take("connect");
-	errRc = ::esp_ble_gattc_open(
+	esp_err_t errRc = ::esp_ble_gattc_open(
 		m_gattc_if,
 		*getPeerAddress().getNative(), // address
 		type,          // Note: This was added on 2018-04-03 when the latest ESP-IDF was detected to have changed the signature.
@@ -141,6 +146,7 @@ bool BLEClient::connect(BLEAddress address, esp_ble_addr_type_t type) {
  */
 void BLEClient::disconnect() {
 	ESP_LOGD(LOG_TAG, ">> disconnect()");
+	// ESP_LOGW(__func__, "gattIf: %d, connId: %d", getGattcIf(), getConnId());
 	esp_err_t errRc = ::esp_ble_gattc_close(getGattcIf(), getConnId());
 	if (errRc != ESP_OK) {
 		ESP_LOGE(LOG_TAG, "esp_ble_gattc_close: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
@@ -165,12 +171,13 @@ void BLEClient::gattClientEventHandler(
 	switch(event) {
 
 		case ESP_GATTC_SRVC_CHG_EVT:
+			if(getConnId() != evtParam->search_res.conn_id)
+				break;
+
 			ESP_LOGI(LOG_TAG, "SERVICE CHANGED");
 			break;
 
 		case ESP_GATTC_CLOSE_EVT: {
-				// esp_ble_gattc_app_unregister(m_appId);
-				// BLEDevice::removePeerDevice(m_gattc_if, true);
 			break;
 		}
 
@@ -197,7 +204,7 @@ void BLEClient::gattClientEventHandler(
 			}
 			break;
 		} // ESP_GATTC_DISCONNECT_EVT
-		
+
 		//
 		// ESP_GATTC_OPEN_EVT
 		//
@@ -207,12 +214,15 @@ void BLEClient::gattClientEventHandler(
 		// - esp_bd_addr_t     remote_bda
 		//
 		case ESP_GATTC_OPEN_EVT: {
+			if(getConnId() != ESP_GATT_IF_NONE)
+				break;
 			m_conn_id = evtParam->open.conn_id;
 			if (m_pClientCallbacks != nullptr) {
 				m_pClientCallbacks->onConnect(this);
 			}
 			if (evtParam->open.status == ESP_GATT_OK) {
 				m_isConnected = true;   // Flag us as connected.
+				m_mtu = evtParam->open.mtu;
 			}
 			m_semaphoreOpenEvt.give(evtParam->open.status);
 			break;
@@ -240,10 +250,13 @@ void BLEClient::gattClientEventHandler(
 			if(evtParam->cfg_mtu.status != ESP_GATT_OK) {
 				ESP_LOGE(LOG_TAG,"Config mtu failed");
 			}
-			m_mtu = evtParam->cfg_mtu.mtu;
+			else
+				m_mtu = evtParam->cfg_mtu.mtu;
 			break;
 
 		case ESP_GATTC_CONNECT_EVT: {
+			if(evtParam->connect.conn_id != getConnId())
+				break;
 			BLEDevice::updatePeerDevice(this, true, m_gattc_if);
 			esp_err_t errRc = esp_ble_gattc_send_mtu_req(gattc_if, evtParam->connect.conn_id);
 			if (errRc != ESP_OK) {
@@ -265,10 +278,10 @@ void BLEClient::gattClientEventHandler(
 		// - uint16_t          conn_id
 		//
 		case ESP_GATTC_SEARCH_CMPL_EVT: {
-			esp_ble_gattc_cb_param_t* p_data = (esp_ble_gattc_cb_param_t*)evtParam;
-			if (p_data->search_cmpl.status != ESP_GATT_OK){
-				ESP_LOGE(LOG_TAG, "search service failed, error status = %x", p_data->search_cmpl.status);
+			if(evtParam->search_cmpl.conn_id != getConnId())
 				break;
+			if (evtParam->search_cmpl.status != ESP_GATT_OK){
+				ESP_LOGE(LOG_TAG, "search service failed, error status = %x", evtParam->search_cmpl.status);
 			}
 #ifndef ARDUINO_ARCH_ESP32
 // commented out just for now to keep backward compatibility			
@@ -280,7 +293,7 @@ void BLEClient::gattClientEventHandler(
 			// 	ESP_LOGI(LOG_TAG, "unknown service source");
 			// }
 #endif
-			m_semaphoreSearchCmplEvt.give(0);
+			m_semaphoreSearchCmplEvt.give(evtParam->search_cmpl.status);
 			break;
 		} // ESP_GATTC_SEARCH_CMPL_EVT
 
@@ -295,6 +308,8 @@ void BLEClient::gattClientEventHandler(
 		// - esp_gatt_id_t srvc_id
 		//
 		case ESP_GATTC_SEARCH_RES_EVT: {
+			if(getConnId() != evtParam->search_res.conn_id)
+				break;
 			BLEUUID uuid = BLEUUID(evtParam->search_res.srvc_id);
 			BLERemoteService* pRemoteService = new BLERemoteService(
 				evtParam->search_res.srvc_id,

cpp_utils/BLEClient.h

@@ -65,14 +65,10 @@ uint16_t m_appId;
 	friend class BLERemoteCharacteristic;
 	friend class BLERemoteDescriptor;
 
-	void                                       gattClientEventHandler(
-		esp_gattc_cb_event_t event,
-		esp_gatt_if_t gattc_if,
-		esp_ble_gattc_cb_param_t* param);
+	void gattClientEventHandler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t* param);
 
 	BLEAddress    m_peerAddress = BLEAddress((uint8_t*)"\0\0\0\0\0\0");   // The BD address of the remote server.
 	uint16_t      m_conn_id;
-//	int           m_deviceType;
 	esp_gatt_if_t m_gattc_if;
 	bool          m_haveServices = false;    // Have we previously obtain the set of services from the remote server.
 	bool          m_isConnected = false;     // Are we currently connected.

cpp_utils/BLEDescriptor.cpp

@@ -11,16 +11,19 @@
 #include <iomanip>
 #include <stdlib.h>
 #include "sdkconfig.h"
-#include <esp_log.h>
 #include <esp_err.h>
 #include "BLEService.h"
 #include "BLEDescriptor.h"
 #include "GeneralUtils.h"
-#ifdef ARDUINO_ARCH_ESP32
+#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG)
 #include "esp32-hal-log.h"
+#define LOG_TAG ""
+#else
+#include "esp_log.h"
+static const char* LOG_TAG = "BLEDescriptor";
 #endif
 
-static const char* LOG_TAG = "BLEDescriptor";
+
 
 
 #define NULL_HANDLE (0xffff)