Merge pull request nkolban#807 from chegewara/master

Minor fixes
cakira · Feb 8, 2019 · bf4fbde · bf4fbde
2 parents 107704b + 43491c7
commit bf4fbde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cpp_utils/BLECharacteristic.cpp b/cpp_utils/BLECharacteristic.cpp
@@ -289,10 +289,10 @@ void BLECharacteristic::handleGATTServerEvent(
 					m_value.addPart(param->write.value, param->write.len);
 					m_writeEvt = true;
 				} else {
+					setValue(param->write.value, param->write.len);
 					if (m_pCallbacks != nullptr && param->write.is_prep != true) {
 						m_pCallbacks->onWrite(this); // Invoke the onWrite callback handler.
 					}
-					setValue(param->write.value, param->write.len);
 				}
 
 				ESP_LOGD(LOG_TAG, " - Response to write event: New value: handle: %.2x, uuid: %s",
@@ -503,7 +503,11 @@ void BLECharacteristic::notify(bool is_notification) {
 	// Test to see if we have a 0x2902 descriptor.  If we do, then check to see if notification is enabled
 	// and, if not, prevent the notification.
 
-	BLE2902 *p2902 = (BLE2902*)getDescriptorByUUID((uint16_t)0x2902);
+	BLE2902* p2902 = (BLE2902*)getDescriptorByUUID((uint16_t)0x2902);
+	if(p2902 == nullptr){
+		ESP_LOGE(LOG_TAG, "Characteristic without 0x2902 descriptor");
+		return;
+	}
 	if(is_notification) {
 		if (p2902 != nullptr && !p2902->getNotifications()) {
 			ESP_LOGD(LOG_TAG, "<< notifications disabled; ignoring");
@@ -537,7 +541,6 @@ void BLECharacteristic::notify(bool is_notification) {
 		if(!is_notification)
 			m_semaphoreConfEvt.wait("indicate");
 	}
-	delete(p2902);
 	ESP_LOGD(LOG_TAG, "<< notify");
 } // Notify
 

diff --git a/cpp_utils/tests/BLETests/Arduino/BLE_client/BLE_client.ino b/cpp_utils/tests/BLETests/Arduino/BLE_client/BLE_client.ino
@@ -62,6 +62,8 @@ bool connectToServer(BLEAddress pAddress) {
     Serial.println(value.c_str());
 
     pRemoteCharacteristic->registerForNotify(notifyCallback);
+
+    return true;
 }
 /**
  * Scan for BLE servers and find the first one that advertises the service we are looking for.