Merge pull request #602 from chegewara/master

Quick fix
nkolban · Jul 10, 2018 · 11125da · 11125da
2 parents 8980fb1 + 8cf6891
commit 11125da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/cpp_utils/BLERemoteCharacteristic.cpp b/cpp_utils/BLERemoteCharacteristic.cpp
@@ -207,7 +207,7 @@ void BLERemoteCharacteristic::gattClientEventHandler(
 				if(m_rawData != nullptr)
 					free(m_rawData);
 
-				m_rawData = calloc(evtParam->read.value_len, sizeof(uint8_t));
+				m_rawData = (uint8_t*) calloc(evtParam->read.value_len, sizeof(uint8_t));
 				memcpy(m_rawData, evtParam->read.value, evtParam->read.value_len);
 			} else {
 				m_value = "";
@@ -501,7 +501,7 @@ void BLERemoteCharacteristic::registerForNotify(
 		uint8_t val[] = {0x01, 0x00};
 		if(!notifications)
 			val[0] = 0x02;
-		BLERemoteDescriptor *desc = getDescriptorByUUID("0x2902");
+		BLERemoteDescriptor *desc = getDescriptor(BLEUUID("0x2902"));
 		desc->writeValue(val, 2);
 	} // End Register
 	else {   // If we weren't passed a callback function, then this is an unregistration.
@@ -516,7 +516,7 @@ void BLERemoteCharacteristic::registerForNotify(
 		}
 
 		uint8_t val[] = {0x00, 0x00};
-		BLERemoteDescriptor *desc = getDescriptorByUUID("0x2902");
+		BLERemoteDescriptor *desc = getDescriptor(BLEUUID("0x2902"));
 		desc->writeValue(val, 2);
 	} // End Unregister
 

diff --git a/cpp_utils/BLEServer.cpp b/cpp_utils/BLEServer.cpp
@@ -352,6 +352,12 @@ void BLEServerCallbacks::onConnect(BLEServer* pServer) {
 	ESP_LOGD("BLEServerCallbacks", "<< onConnect()");
 } // onConnect
 
+void BLEServerCallbacks::onConnect(BLEServer* pServer, esp_ble_gatts_cb_param_t *param) {
+	ESP_LOGD("BLEServerCallbacks", ">> onConnect(): Default");
+	ESP_LOGD("BLEServerCallbacks", "Device: %s", BLEDevice::toString().c_str());
+	ESP_LOGD("BLEServerCallbacks", "<< onConnect()");
+} // onConnect
+
 
 void BLEServerCallbacks::onDisconnect(BLEServer* pServer) {
 	ESP_LOGD("BLEServerCallbacks", ">> onDisconnect(): Default");