Fixes for nkolban#101

nkolban · nkolban · commit 1bc04029909d · 2017-10-07T10:47:31.000-05:00
diff --git a/cpp_utils/BLERemoteCharacteristic.h b/cpp_utils/BLERemoteCharacteristic.h
@@ -38,6 +38,7 @@ class BLERemoteCharacteristic {
 	bool        canWriteNoResponse();
 	BLERemoteDescriptor* getDescriptor(BLEUUID uuid);
 	std::map<std::string, BLERemoteDescriptor *>* getDescriptors();
+	uint16_t    getHandle();
 	BLEUUID     getUUID();
 	std::string readValue(void);
 	uint8_t     readUInt8(void);
@@ -61,7 +62,7 @@ class BLERemoteCharacteristic {
 		esp_gatt_if_t             gattc_if,
 		esp_ble_gattc_cb_param_t* evtParam);
 
-	uint16_t          getHandle();
+
 	BLERemoteService* getRemoteService();
 	void              removeDescriptors();
 	void              retrieveDescriptors();
diff --git a/cpp_utils/BLERemoteDescriptor.h b/cpp_utils/BLERemoteDescriptor.h
@@ -23,6 +23,7 @@ class BLERemoteCharacteristic;
  */
 class BLERemoteDescriptor {
 public:
+	uint16_t    getHandle();
 	BLEUUID     getUUID();
 	std::string readValue(void);
 	uint8_t     readUInt8(void);
@@ -48,7 +49,7 @@ class BLERemoteDescriptor {
 	BLERemoteCharacteristic* m_pRemoteCharacteristic;   // Reference to the Remote characteristic of which this descriptor is associated.
 	FreeRTOS::Semaphore      m_semaphoreReadDescrEvt      = FreeRTOS::Semaphore("ReadDescrEvt");
 
-	uint16_t getHandle();
+
 };
 #endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ */
diff --git a/cpp_utils/BLERemoteService.h b/cpp_utils/BLERemoteService.h
@@ -35,6 +35,7 @@ class BLERemoteService {
 	std::map<std::string, BLERemoteCharacteristic*>* getCharacteristics();
 
 	BLEClient*               getClient(void);
+	uint16_t                 getHandle();
 	BLEUUID                  getUUID(void);
 	std::string              toString(void);
 
@@ -48,7 +49,6 @@ class BLERemoteService {
 
 	// Private methods
 	void                retrieveCharacteristics(void);
-	uint16_t            getHandle();
 	esp_gatt_id_t*      getSrvcId(void);
 	uint16_t            getStartHandle();
 	uint16_t            getEndHandle();
