h2zero · h2zero · May 10, 2020 · May 7, 2020 · May 9, 2020
diff --git a/src/NimBLEAdvertisedDevice.cpp b/src/NimBLEAdvertisedDevice.cpp
@@ -141,7 +141,7 @@ NimBLEUUID NimBLEAdvertisedDevice::getServiceUUID() {  //TODO Remove it eventual
  * @brief Check advertised serviced for existence required UUID
  * @return Return true if service is advertised
  */
-bool NimBLEAdvertisedDevice::isAdvertisingService(NimBLEUUID uuid){
+bool NimBLEAdvertisedDevice::isAdvertisingService(const NimBLEUUID &uuid){
     for (int i = 0; i < m_serviceUUIDs.size(); i++) {
         NIMBLE_LOGI(LOG_TAG, "Comparing UUIDS: %s %s", m_serviceUUIDs[i].toString().c_str(), uuid.toString().c_str());
         if (m_serviceUUIDs[i].equals(uuid)) return true;

diff --git a/src/NimBLEAdvertisedDevice.h b/src/NimBLEAdvertisedDevice.h
@@ -54,7 +54,7 @@ class NimBLEAdvertisedDevice {
     void setAddressType(uint8_t type);
 
 
-    bool        isAdvertisingService(NimBLEUUID uuid);
+    bool        isAdvertisingService(const NimBLEUUID &uuid);
     bool        haveAppearance();
     bool        haveManufacturerData();
     bool        haveName();

diff --git a/src/NimBLEAdvertising.cpp b/src/NimBLEAdvertising.cpp
@@ -58,7 +58,7 @@ NimBLEAdvertising::NimBLEAdvertising() {
  * @brief Add a service uuid to exposed list of services.
  * @param [in] serviceUUID The UUID of the service to expose.
  */
-void NimBLEAdvertising::addServiceUUID(NimBLEUUID serviceUUID) {
+void NimBLEAdvertising::addServiceUUID(const NimBLEUUID &serviceUUID) {
 	m_serviceUUIDs.push_back(serviceUUID);
 } // addServiceUUID
 
@@ -393,7 +393,7 @@ void NimBLEAdvertising::onHostReset() {
  * @brief Add data to the payload to be advertised.
  * @param [in] data The data to be added to the payload.
  */
-void NimBLEAdvertisementData::addData(std::string data) {
+void NimBLEAdvertisementData::addData(const std::string &data) {
 	if ((m_payload.length() + data.length()) > BLE_HS_ADV_MAX_SZ) {
 		return;
 	}
@@ -420,7 +420,7 @@ void NimBLEAdvertisementData::setAppearance(uint16_t appearance) {
  * @brief Set the complete services.
  * @param [in] uuid The single service to advertise.
  */
-void NimBLEAdvertisementData::setCompleteServices(NimBLEUUID uuid) {
+void NimBLEAdvertisementData::setCompleteServices(const NimBLEUUID &uuid) {
 	char cdata[2];
 	switch (uuid.bitSize()) {
 		case 16: {
@@ -482,7 +482,7 @@ void NimBLEAdvertisementData::setFlags(uint8_t flag) {
  * @brief Set manufacturer specific data.
  * @param [in] data Manufacturer data.
  */
-void NimBLEAdvertisementData::setManufacturerData(std::string data) {
+void NimBLEAdvertisementData::setManufacturerData(const std::string &data) {
 	NIMBLE_LOGD("NimBLEAdvertisementData", ">> setManufacturerData");
 	char cdata[2];
 	cdata[0] = data.length() + 1;
@@ -496,7 +496,7 @@ void NimBLEAdvertisementData::setManufacturerData(std::string data) {
  * @brief Set the name.
  * @param [in] The complete name of the device.
  */
-void NimBLEAdvertisementData::setName(std::string name) {
+void NimBLEAdvertisementData::setName(const std::string &name) {
 	NIMBLE_LOGD("NimBLEAdvertisementData", ">> setName: %s", name.c_str());
 	char cdata[2];
 	cdata[0] = name.length() + 1;
@@ -510,7 +510,7 @@ void NimBLEAdvertisementData::setName(std::string name) {
  * @brief Set the partial services.
  * @param [in] uuid The single service to advertise.
  */
-void NimBLEAdvertisementData::setPartialServices(NimBLEUUID uuid) {
+void NimBLEAdvertisementData::setPartialServices(const NimBLEUUID &uuid) {
 	char cdata[2];
 	switch (uuid.bitSize()) {
 		case 16: {
@@ -548,7 +548,7 @@ void NimBLEAdvertisementData::setPartialServices(NimBLEUUID uuid) {
  * @param [in] uuid The UUID to set with the service data.  Size of UUID will be used.
  * @param [in] data The data to be associated with the service data advert.
  */
-void NimBLEAdvertisementData::setServiceData(NimBLEUUID uuid, std::string data) {
+void NimBLEAdvertisementData::setServiceData(const NimBLEUUID &uuid, const std::string &data) {
 	char cdata[2];
 	switch (uuid.bitSize()) {
 		case 16: {
@@ -585,7 +585,7 @@ void NimBLEAdvertisementData::setServiceData(NimBLEUUID uuid, std::string data)
  * @brief Set the short name.
  * @param [in] The short name of the device.
  */
-void NimBLEAdvertisementData::setShortName(std::string name) {
+void NimBLEAdvertisementData::setShortName(const std::string &name) {
 	NIMBLE_LOGD("NimBLEAdvertisementData", ">> setShortName: %s", name.c_str());
 	char cdata[2];
 	cdata[0] = name.length() + 1;
@@ -603,4 +603,4 @@ std::string NimBLEAdvertisementData::getPayload() {
 	return m_payload;
 } // getPayload
 
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED */
diff --git a/src/NimBLEAdvertising.h b/src/NimBLEAdvertising.h
@@ -47,14 +47,14 @@ class NimBLEAdvertisementData {
 	//
 public:
 	void setAppearance(uint16_t appearance);
-	void setCompleteServices(NimBLEUUID uuid);
+	void setCompleteServices(const NimBLEUUID &uuid);
 	void setFlags(uint8_t);
-	void setManufacturerData(std::string data);
-	void setName(std::string name);
-	void setPartialServices(NimBLEUUID uuid);
-	void setServiceData(NimBLEUUID uuid, std::string data);
-	void setShortName(std::string name);
-	void addData(std::string data);  // Add data to the payload.
+	void setManufacturerData(const std::string &data);
+	void setName(const std::string &name);
+	void setPartialServices(const NimBLEUUID &uuid);
+	void setServiceData(const NimBLEUUID &uuid, const std::string &data);
+	void setShortName(const std::string &name);
+	void addData(const std::string &data);  // Add data to the payload.
 	std::string getPayload();               // Retrieve the current advert payload.
 
 private:
@@ -71,7 +71,7 @@ class NimBLEAdvertisementData {
 class NimBLEAdvertising {
 public:
 	NimBLEAdvertising();
-	void addServiceUUID(NimBLEUUID serviceUUID);
+	void addServiceUUID(const NimBLEUUID &serviceUUID);
 	void addServiceUUID(const char* serviceUUID);
 	void start();
 	void stop();
@@ -102,4 +102,4 @@ class NimBLEAdvertising {
 
 };
 #endif /* CONFIG_BT_ENABLED */
-#endif /* MAIN_BLEADVERTISING_H_ */
+#endif /* MAIN_BLEADVERTISING_H_ */
diff --git a/src/NimBLEBeacon.cpp b/src/NimBLEBeacon.cpp
@@ -58,7 +58,7 @@ int8_t NimBLEBeacon::getSignalPower() {
 /**
  * Set the raw data for the beacon record.
  */
-void NimBLEBeacon::setData(std::string data) {
+void NimBLEBeacon::setData(const std::string &data) {
 	if (data.length() != sizeof(m_beaconData)) {
 		NIMBLE_LOGE(LOG_TAG, "Unable to set the data ... length passed in was %d and expected %d", 
                                                         data.length(), sizeof(m_beaconData));
@@ -79,9 +79,10 @@ void NimBLEBeacon::setMinor(uint16_t minor) {
 	m_beaconData.minor = ENDIAN_CHANGE_U16(minor);
 } // setMinior
 
-void NimBLEBeacon::setProximityUUID(NimBLEUUID uuid) {
-	uuid = uuid.to128();
-	memcpy(m_beaconData.proximityUUID, uuid.getNative()->u128.value, 16);
+void NimBLEBeacon::setProximityUUID(const NimBLEUUID &uuid) {
+	NimBLEUUID temp_uuid = uuid;
+	temp_uuid.to128();
+	memcpy(m_beaconData.proximityUUID, temp_uuid.getNative()->u128.value, 16);
 } // setProximityUUID
 
 void NimBLEBeacon::setSignalPower(int8_t signalPower) {

diff --git a/src/NimBLEBeacon.h b/src/NimBLEBeacon.h
@@ -39,11 +39,11 @@ class NimBLEBeacon {
 	uint16_t    getManufacturerId();
 	NimBLEUUID     getProximityUUID();
 	int8_t      getSignalPower();
-	void        setData(std::string data);
+	void        setData(const std::string &data);
 	void        setMajor(uint16_t major);
 	void        setMinor(uint16_t minor);
 	void        setManufacturerId(uint16_t manufacturerId);
-	void        setProximityUUID(NimBLEUUID uuid);
+	void        setProximityUUID(const NimBLEUUID &uuid);
 	void        setSignalPower(int8_t signalPower);
 }; // NimBLEBeacon
 

diff --git a/src/NimBLECharacteristic.cpp b/src/NimBLECharacteristic.cpp
@@ -41,7 +41,7 @@ NimBLECharacteristic::NimBLECharacteristic(const char* uuid, uint16_t properties
  * @param [in] uuid - UUID for the characteristic.
  * @param [in] properties - Properties for the characteristic.
  */
-NimBLECharacteristic::NimBLECharacteristic(NimBLEUUID uuid, uint16_t properties, NimBLEService* pService) {
+NimBLECharacteristic::NimBLECharacteristic(const NimBLEUUID &uuid, uint16_t properties, NimBLEService* pService) {
 	m_uuid       = uuid;
 	m_handle     = NULL_HANDLE;
 	m_properties = properties;
@@ -99,7 +99,7 @@ NimBLEDescriptor* NimBLECharacteristic::createDescriptor(const char* uuid, uint3
  * @param [in] properties - The properties of the descriptor.
  * @return The new BLE descriptor.
  */
-NimBLEDescriptor* NimBLECharacteristic::createDescriptor(NimBLEUUID uuid, uint32_t properties, uint16_t max_len) {
+NimBLEDescriptor* NimBLECharacteristic::createDescriptor(const NimBLEUUID &uuid, uint32_t properties, uint16_t max_len) {
 	NimBLEDescriptor* pDescriptor = nullptr;
 	if(uuid.equals(NimBLEUUID((uint16_t)0x2902))) {
         if(!(m_properties & BLE_GATT_CHR_F_NOTIFY) && !(m_properties & BLE_GATT_CHR_F_INDICATE)) {
@@ -139,7 +139,7 @@ NimBLEDescriptor* NimBLECharacteristic::getDescriptorByUUID(const char* descript
  * @param [in] descriptorUUID The UUID of the descriptor that we wish to retrieve.
  * @return The BLE Descriptor.  If no such descriptor is associated with the characteristic, nullptr is returned.
  */
-NimBLEDescriptor* NimBLECharacteristic::getDescriptorByUUID(NimBLEUUID descriptorUUID) {
+NimBLEDescriptor* NimBLECharacteristic::getDescriptorByUUID(const NimBLEUUID &descriptorUUID) {
 	return m_descriptorMap.getByUUID(descriptorUUID);
 } // getDescriptorByUUID
 
@@ -518,7 +518,7 @@ void NimBLECharacteristic::setWriteProperty(bool value) {
  * @param [in] data The data to set for the characteristic.
  * @param [in] length The length of the data in bytes.
  */
-void NimBLECharacteristic::setValue(uint8_t* data, size_t length) {
+void NimBLECharacteristic::setValue(const uint8_t* data, size_t length) {
 	char* pHex = NimBLEUtils::buildHexData(nullptr, data, length);
 	NIMBLE_LOGD(LOG_TAG, ">> setValue: length=%d, data=%s, characteristic UUID=%s", length, pHex, getUUID().toString().c_str());
 	free(pHex);
@@ -546,7 +546,7 @@ void NimBLECharacteristic::setValue(uint8_t* data, size_t length) {
  * @param [in] Set the value of the characteristic.
  * @return N/A.
  */
-void NimBLECharacteristic::setValue(std::string value) {
+void NimBLECharacteristic::setValue(const std::string &value) {
 	setValue((uint8_t*)(value.data()), value.length());
 } // setValue
 

diff --git a/src/NimBLECharacteristic.h b/src/NimBLECharacteristic.h
@@ -58,10 +58,10 @@ class NimBLECharacteristicCallbacks;
 class NimBLEDescriptorMap {
 public:
 	void setByUUID(const char* uuid, NimBLEDescriptor* pDescriptor);
-	void setByUUID(NimBLEUUID uuid, NimBLEDescriptor* pDescriptor);
+	void setByUUID(const NimBLEUUID &uuid, NimBLEDescriptor* pDescriptor);
 //	void setByHandle(uint16_t handle, NimBLEDescriptor* pDescriptor);
 	NimBLEDescriptor* getByUUID(const char* uuid);
-	NimBLEDescriptor* getByUUID(NimBLEUUID uuid);
+	NimBLEDescriptor* getByUUID(const NimBLEUUID &uuid);
 //	NimBLEDescriptor* getByHandle(uint16_t handle);
 	std::string	toString();
 	NimBLEDescriptor* getFirst();
@@ -87,13 +87,13 @@ class NimBLECharacteristic {
 						uint32_t properties = NIMBLE_PROPERTY::READ | 
 											  NIMBLE_PROPERTY::WRITE,
                                      uint16_t max_len = 100);
-	NimBLEDescriptor* createDescriptor(NimBLEUUID uuid,
+	NimBLEDescriptor* createDescriptor(const NimBLEUUID &uuid,
 						uint32_t properties = NIMBLE_PROPERTY::READ | 
 											  NIMBLE_PROPERTY::WRITE,
                                      uint16_t max_len = 100);
 
 	NimBLEDescriptor* getDescriptorByUUID(const char* descriptorUUID);
-	NimBLEDescriptor* getDescriptorByUUID(NimBLEUUID descriptorUUID);
+	NimBLEDescriptor* getDescriptorByUUID(const NimBLEUUID &descriptorUUID);
 	NimBLEUUID        getUUID();
 	std::string       getValue();
 	uint8_t*          getData();
@@ -110,8 +110,8 @@ class NimBLECharacteristic {
     void setWriteProperty(bool value);
 	void setWriteNoResponseProperty(bool value);
 //////////////////////////////////////////////////////    
-	void setValue(uint8_t* data, size_t size);
-	void setValue(std::string value);
+	void setValue(const uint8_t* data, size_t size);
+	void setValue(const std::string &value);
 	void setValue(uint16_t& data16);
 	void setValue(uint32_t& data32);
 	void setValue(int& data32);
@@ -141,7 +141,7 @@ class NimBLECharacteristic {
 
 	NimBLECharacteristic(const char* uuid, uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
 														NimBLEService* pService = nullptr);
-	NimBLECharacteristic(NimBLEUUID uuid, uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
+	NimBLECharacteristic(const NimBLEUUID &uuid, uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
 														NimBLEService* pService = nullptr);
 	virtual ~NimBLECharacteristic();
 

diff --git a/src/NimBLECharacteristicMap.cpp b/src/NimBLECharacteristicMap.cpp
@@ -41,7 +41,7 @@ NimBLECharacteristic* NimBLECharacteristicMap::getByUUID(const char* uuid) {
  * @param [in] UUID The UUID to look up the characteristic.
  * @return The characteristic.
  */
-NimBLECharacteristic* NimBLECharacteristicMap::getByUUID(NimBLEUUID uuid) {
+NimBLECharacteristic* NimBLECharacteristicMap::getByUUID(const NimBLEUUID &uuid) {
 	for (auto &myPair : m_uuidMap) {
 		if (myPair.first->getUUID().equals(uuid)) {
 			return myPair.first;
@@ -100,7 +100,7 @@ void NimBLECharacteristicMap::setByHandle(uint16_t handle, NimBLECharacteristic*
  * @param [in] characteristic The characteristic to cache.
  * @return N/A.
  */
-void NimBLECharacteristicMap::setByUUID(NimBLECharacteristic* pCharacteristic, NimBLEUUID uuid) {
+void NimBLECharacteristicMap::setByUUID(NimBLECharacteristic* pCharacteristic, const NimBLEUUID &uuid) {
 	m_uuidMap.insert(std::pair<NimBLECharacteristic*, std::string>(pCharacteristic, uuid.toString()));
 } // setByUUID
 
@@ -125,4 +125,4 @@ std::string NimBLECharacteristicMap::toString() {
 } // toString
 
 
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED */
diff --git a/src/NimBLEClient.cpp b/src/NimBLEClient.cpp
@@ -120,7 +120,7 @@ bool NimBLEClient::connect(NimBLEAdvertisedDevice* device, bool refreshServices)
  * @param [in] address The address of the partner.
  * @return True on success.
  */
-bool NimBLEClient::connect(NimBLEAddress address, uint8_t type, bool refreshServices) {
+bool NimBLEClient::connect(const NimBLEAddress &address, uint8_t type, bool refreshServices) {
     NIMBLE_LOGD(LOG_TAG, ">> connect(%s)", address.toString().c_str());
 
     if(!NimBLEDevice::m_synced) {
@@ -359,7 +359,7 @@ NimBLERemoteService* NimBLEClient::getService(const char* uuid) {
  * @param [in] uuid The UUID of the service being sought.
  * @return A reference to the Service or nullptr if don't know about it.
  */
-NimBLERemoteService* NimBLEClient::getService(NimBLEUUID uuid) {
+NimBLERemoteService* NimBLEClient::getService(const NimBLEUUID &uuid) {
     NIMBLE_LOGD(LOG_TAG, ">> getService: uuid: %s", uuid.toString().c_str());
 
     if (!m_haveServices) {
@@ -494,7 +494,7 @@ int NimBLEClient::serviceDiscoveredCB(
  * @param [in] characteristicUUID The characteristic whose value we wish to read.
  * @returns characteristic value or an empty string if not found
  */
-std::string NimBLEClient::getValue(NimBLEUUID serviceUUID, NimBLEUUID characteristicUUID) {
+std::string NimBLEClient::getValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID) {
     NIMBLE_LOGD(LOG_TAG, ">> getValue: serviceUUID: %s, characteristicUUID: %s", serviceUUID.toString().c_str(), characteristicUUID.toString().c_str());
 
     std::string ret = "";
@@ -518,7 +518,7 @@ std::string NimBLEClient::getValue(NimBLEUUID serviceUUID, NimBLEUUID characteri
  * @param [in] characteristicUUID The characteristic whose value we wish to write.
  * @returns true if successful otherwise false
  */
-bool NimBLEClient::setValue(NimBLEUUID serviceUUID, NimBLEUUID characteristicUUID, std::string value) {
+bool NimBLEClient::setValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID, const std::string &value) {
     NIMBLE_LOGD(LOG_TAG, ">> setValue: serviceUUID: %s, characteristicUUID: %s", serviceUUID.toString().c_str(), characteristicUUID.toString().c_str());
 
     bool ret = false;

diff --git a/src/NimBLEClient.h b/src/NimBLEClient.h
@@ -34,15 +34,15 @@ class NimBLEAdvertisedDevice;
 class NimBLEClient {
 public:
     bool                                       connect(NimBLEAdvertisedDevice* device, bool refreshServices = true);
-    bool                                       connect(NimBLEAddress address, uint8_t type = BLE_ADDR_PUBLIC, bool refreshServices = true);   // Connect to the remote BLE Server
+    bool                                       connect(const NimBLEAddress &address, uint8_t type = BLE_ADDR_PUBLIC, bool refreshServices = true);   // Connect to the remote BLE Server
     int                                        disconnect(uint8_t reason = BLE_ERR_REM_USER_CONN_TERM);                  // Disconnect from the remote BLE Server
     NimBLEAddress                              getPeerAddress();              // Get the address of the remote BLE Server
     int                                        getRssi();                     // Get the RSSI of the remote BLE Server
     std::map<std::string, NimBLERemoteService*>*  getServices();                 // Get a map of the services offered by the remote BLE Server
     NimBLERemoteService*                          getService(const char* uuid);  // Get a reference to a specified service offered by the remote BLE server.
-    NimBLERemoteService*                          getService(NimBLEUUID uuid);   // Get a reference to a specified service offered by the remote BLE server.
-    std::string                                getValue(NimBLEUUID serviceUUID, NimBLEUUID characteristicUUID);   // Get the value of a given characteristic at a given service.
-    bool                                       setValue(NimBLEUUID serviceUUID, NimBLEUUID characteristicUUID, std::string value);   // Set the value of a given characteristic at a given service.
+    NimBLERemoteService*                          getService(const NimBLEUUID &uuid);   // Get a reference to a specified service offered by the remote BLE server.
+    std::string                                getValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID);   // Get the value of a given characteristic at a given service.
+    bool                                       setValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID, const std::string &value);   // Set the value of a given characteristic at a given service.
     bool                                       isConnected();                 // Return true if we are connected.
     void                                       setClientCallbacks(NimBLEClientCallbacks *pClientCallbacks, bool deleteCallbacks = true);
     std::string                                toString();                    // Return a string representation of this client.

diff --git a/src/NimBLEDescriptor.cpp b/src/NimBLEDescriptor.cpp
@@ -187,7 +187,7 @@ void NimBLEDescriptor::setHandle(uint16_t handle) {
  * @param [in] data The data to set for the descriptor.
  * @param [in] length The length of the data in bytes.
  */
-void NimBLEDescriptor::setValue(uint8_t* data, size_t length) {
+void NimBLEDescriptor::setValue(const uint8_t* data, size_t length) {
 	if (length > BLE_ATT_ATTR_MAX_LEN) {
 		NIMBLE_LOGE(LOG_TAG, "Size %d too large, must be no bigger than %d", length, BLE_ATT_ATTR_MAX_LEN);
 		return;
@@ -201,7 +201,7 @@ void NimBLEDescriptor::setValue(uint8_t* data, size_t length) {
  * @brief Set the value of the descriptor.
  * @param [in] value The value of the descriptor in string form.
  */
-void NimBLEDescriptor::setValue(std::string value) {
+void NimBLEDescriptor::setValue(const std::string &value) {
 	setValue((uint8_t*) value.data(), value.length());
 } // setValue
 
@@ -245,4 +245,4 @@ void NimBLEDescriptorCallbacks::onWrite(NimBLEDescriptor* pDescriptor) {
 } // onWrite
 
 
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED */