some small bugfixes

chegewara · chegewara · commit 482f7b406289 · 2018-10-02T19:45:12.000+02:00
diff --git a/cpp_utils/BLEAdvertisedDevice.cpp b/cpp_utils/BLEAdvertisedDevice.cpp
@@ -137,7 +137,7 @@ BLEUUID BLEAdvertisedDevice::getServiceUUID() {  //TODO Remove it eventually, is
  * @return Return true if service is advertised
  */
 bool BLEAdvertisedDevice::isAdvertisingService(BLEUUID uuid){
-	for (int i = 0; i < m_serviceUUIDs.size(); ++i) {
+	for (int i = 0; i < m_serviceUUIDs.size(); i++) {
 		if(m_serviceUUIDs[i].equals(uuid))
 			return true;
 	}
diff --git a/cpp_utils/BLERemoteService.cpp b/cpp_utils/BLERemoteService.cpp
@@ -114,7 +114,7 @@ void BLERemoteService::gattClientEventHandler(
 	} // switch
 
 	// Send the event to each of the characteristics owned by this service.
-	for (auto &myPair : m_characteristicMap) {
+	for (auto &myPair : m_characteristicMapByHandle) {
 	   myPair.second->gattClientEventHandler(event, gattc_if, evtParam);
 	}
 } // gattClientEventHandler
@@ -206,7 +206,7 @@ void BLERemoteService::retrieveCharacteristics() {
 		);
 
 		m_characteristicMap.insert(std::pair<std::string, BLERemoteCharacteristic*>(pNewRemoteCharacteristic->getUUID().toString(), pNewRemoteCharacteristic));
-
+		m_characteristicMapByHandle.insert(std::pair<uint16_t, BLERemoteCharacteristic*>(result.char_handle, pNewRemoteCharacteristic));
 		offset++;   // Increment our count of number of descriptors found.
 	} // Loop forever (until we break inside the loop).
 
@@ -231,6 +231,12 @@ std::map<std::string, BLERemoteCharacteristic *> * BLERemoteService::getCharacte
 	return &m_characteristicMap;
 } // getCharacteristics
 
+/**
+ * @brief This function is designed to get characteristics map when we have multiple characteristics with the same UUID
+ */
+void BLERemoteService::getCharacteristics(std::map<uint16_t, BLERemoteCharacteristic*>* pCharacteristicMap){
+	pCharacteristicMap = &m_characteristicMapByHandle;
+}  // Get the characteristics map.
 
 /**
  * @brief Get the client associated with this service.
@@ -292,6 +298,10 @@ void BLERemoteService::removeCharacteristics() {
 	   //m_characteristicMap.erase(myPair.first);  // Should be no need to delete as it will be deleted by the clear
 	}
 	m_characteristicMap.clear();   // Clear the map
+	for (auto &myPair : m_characteristicMapByHandle) {
+	   delete myPair.second;
+	}
+	m_characteristicMapByHandle.clear();   // Clear the map
 } // removeCharacteristics
 
 
diff --git a/cpp_utils/tests/BLETests/Arduino/BLE_iBeacon/BLE_iBeacon.ino b/cpp_utils/tests/BLETests/Arduino/BLE_iBeacon/BLE_iBeacon.ino
@@ -49,7 +49,7 @@ void setBeacon() {
 
   BLEBeacon oBeacon = BLEBeacon();
   oBeacon.setManufacturerId(0x4C00); // fake Apple 0x004C LSB (ENDIAN_CHANGE_U16!)
-  oBeacon.setProximityUUID(BLEUUID(BEACON_UUID));
+  oBeacon.setProximityUUID(BLEUUID(BEACON_UUID)); 
   oBeacon.setMajor((bootcount & 0xFFFF0000) >> 16);
   oBeacon.setMinor(bootcount&0xFFFF);
   BLEAdvertisementData oAdvertisementData = BLEAdvertisementData();
@@ -84,10 +84,10 @@ void setup() {
   // Create the BLE Device
   BLEDevice::init("");
 
-  // Create the BLE Server
-  BLEServer *pServer = BLEDevice::createServer();
+  // Create the BLE Server is no longer required to crete beacon
+  // BLEServer *pServer = BLEDevice::createServer();
 
-  pAdvertising = pServer->getAdvertising();
+  pAdvertising = BLEDevice::getAdvertising();
   
   setBeacon();
    // Start advertising

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ BLEUUID BLEAdvertisedDevice::getServiceUUID() { //TODO Remove it eventually, is`
`137`	`137`	`* @return Return true if service is advertised`
`138`	`138`	`*/`
`139`	`139`	`bool BLEAdvertisedDevice::isAdvertisingService(BLEUUID uuid){`
`140`		`- for (int i = 0; i < m_serviceUUIDs.size(); ++i) {`
	`140`	`+ for (int i = 0; i < m_serviceUUIDs.size(); i++) {`
`141`	`141`	`if(m_serviceUUIDs[i].equals(uuid))`
`142`	`142`	`return true;`
`143`	`143`	`}`