Changed std::string to String

libraries/BluetoothSerial/src/BTAddress.cpp

@@ -105,7 +105,7 @@ String BTAddress::toString(bool capital) const {
 	}else{
 		snprintf(res, size, "%02x:%02x:%02x:%02x:%02x:%02x", m_address[0], m_address[1], m_address[2], m_address[3], m_address[4], m_address[5]);
 	}
-	std::string ret(res);
+	String ret(res);
 	free(res);
 	return ret;
 } // toString

libraries/BluetoothSerial/src/BTAddress.h

@@ -12,7 +12,7 @@
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 #include <esp_gap_bt_api.h> // ESP32 BT
-#include <string>
+#include <Arduino.h>
 
 
 /**

libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp

@@ -39,7 +39,7 @@ bool        BTAdvertisedDeviceSet::haveRSSI() const { return m_haveRSSI; }
  * @return A string representation of this device.
  */
 std::string BTAdvertisedDeviceSet::toString() {
-	std::string res = "Name: " + getName() + ", Address: " + getAddress().toString();
+	std::string res = "Name: " + getName() + ", Address: " + std::string(getAddress().toString().c_str(), getAddress().toString().length());
 	if (haveCOD()) {
 		char val[6];
 		snprintf(val, sizeof(val), "%d", getCOD());

libraries/BluetoothSerial/src/BTScanResultsSet.cpp

@@ -84,7 +84,7 @@ void BTScanResultsSet::clear() {
 }
 
 bool BTScanResultsSet::add(BTAdvertisedDeviceSet advertisedDevice, bool unique) {
-	std::string key = advertisedDevice.getAddress().toString();
+	std::string key = std::string(advertisedDevice.getAddress().toString().c_str(), advertisedDevice.getAddress().toString().length());
 	if (!unique || m_vectorAdvertisedDevices.count(key) == 0) {
 		m_vectorAdvertisedDevices.insert(std::pair<std::string, BTAdvertisedDeviceSet>(key, advertisedDevice));
 		return true;

libraries/BluetoothSerial/src/BluetoothSerial.h

@@ -87,7 +87,7 @@ class BluetoothSerial: public Stream
         operator bool() const;
         void getBtAddress(uint8_t *mac);
         BTAddress getBtAddressObject();
-        std::string getBtAddressString();
+        String getBtAddressString();
     private:
         String local_name;
         int timeoutTicks=0;