More chnages for nkolban#99

nkolban · nkolban · commit 036971d925da · 2017-10-06T09:56:04.000-05:00
diff --git a/cpp_utils/BLERemoteCharacteristic.cpp b/cpp_utils/BLERemoteCharacteristic.cpp
@@ -41,7 +41,7 @@ BLERemoteCharacteristic::BLERemoteCharacteristic(
 	m_pRemoteService = pRemoteService;
 	m_notifyCallback = nullptr;
 
-	retrieveCharacteristics(); // Get the descriptors for this characteristic
+	retrieveDescriptors(); // Get the descriptors for this characteristic
 	ESP_LOGD(LOG_TAG, "<< BLERemoteCharacteristic");
 } // BLERemoteCharacteristic
 
@@ -276,8 +276,8 @@ void BLERemoteCharacteristic::gattClientEventHandler(
 /**
  * @brief Populate the descriptors (if any) for this characteristic.
  */
-void BLERemoteCharacteristic::retrieveCharacteristics() {
-	ESP_LOGD(LOG_TAG, ">> retrieveCharacteristics() for characteristic: %s", getUUID().toString().c_str());
+void BLERemoteCharacteristic::retrieveDescriptors() {
+	ESP_LOGD(LOG_TAG, ">> retrieveDescriptors() for characteristic: %s", getUUID().toString().c_str());
 
 	removeDescriptors();   // Remove any existing descriptors.
 
@@ -322,7 +322,7 @@ void BLERemoteCharacteristic::retrieveCharacteristics() {
 		offset++;
 	} // while true
 	//m_haveCharacteristics = true; // Remember that we have received the characteristics.
-	ESP_LOGD(LOG_TAG, "<< getDescriptors(): Found %d descriptors.", offset);
+	ESP_LOGD(LOG_TAG, "<< retrieveDescriptors(): Found %d descriptors.", offset);
 } // getDescriptors
 
 
diff --git a/cpp_utils/BLERemoteCharacteristic.h b/cpp_utils/BLERemoteCharacteristic.h
@@ -37,6 +37,7 @@ class BLERemoteCharacteristic {
 	bool        canWrite();
 	bool        canWriteNoResponse();
 	BLERemoteDescriptor *getDescriptor(BLEUUID uuid);
+	std::map<std::string, BLERemoteDescriptor *>* getDescriptors();
 	BLEUUID     getUUID();
 	std::string readValue(void);
 	uint8_t     readUInt8(void);
@@ -59,11 +60,11 @@ class BLERemoteCharacteristic {
 		esp_gattc_cb_event_t      event,
 		esp_gatt_if_t             gattc_if,
 		esp_ble_gattc_cb_param_t* evtParam);
-	std::map<std::string, BLERemoteDescriptor *>* getDescriptors();
+
 	uint16_t          getHandle();
 	BLERemoteService* getRemoteService();
 	void              removeDescriptors();
-	void              retrieveCharacteristics();
+	void              retrieveDescriptors();
 
 	// Private properties
 	BLEUUID              m_uuid;
