Changed std::string to Arduino String

Author: PilnyTomas

libraries/BLE/examples/EddystoneTLM_Beacon/EddystoneTLM_Beacon.ino

@@ -56,7 +56,7 @@ void setBeacon()
 
   BLEAdvertisementData oAdvertisementData = BLEAdvertisementData();
   BLEAdvertisementData oScanResponseData = BLEAdvertisementData();
-  oScanResponseData.setServiceData(BLEUUID((uint16_t)0xFEAA), std::string(EddystoneTLM.getData().c_str(), EddystoneTLM.getData().length()));
+  oScanResponseData.setServiceData(BLEUUID((uint16_t)0xFEAA), String(EddystoneTLM.getData().c_str(), EddystoneTLM.getData().length()));
 
   oAdvertisementData.setName("ESP32 TLM Beacon");
   pAdvertising->setAdvertisementData(oAdvertisementData);

libraries/BLE/src/BLEAddress.cpp

@@ -109,11 +109,11 @@ esp_bd_addr_t *BLEAddress::getNative() {
  *
  * @return The string representation of the address.
  */
-std::string BLEAddress::toString() {
+String BLEAddress::toString() {
 	auto size = 18;
 	char *res = (char*)malloc(size);
 	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/BLE/src/BLEAddress.h

@@ -32,8 +32,8 @@ class BLEAddress {
   bool           operator<=(const BLEAddress& otherAddress) const;
   bool           operator>(const BLEAddress& otherAddress) const;
   bool           operator>=(const BLEAddress& otherAddress) const;
-	esp_bd_addr_t* getNative();
-	std::string    toString();
+  esp_bd_addr_t* getNative();
+  String         toString();
 
 private:
 	esp_bd_addr_t m_address;

libraries/BLE/src/BLEAdvertisedDevice.cpp

@@ -72,7 +72,7 @@ uint16_t BLEAdvertisedDevice::getAppearance() {
  * @brief Get the manufacturer data.
  * @return The manufacturer data of the advertised device.
  */
-std::string BLEAdvertisedDevice::getManufacturerData() {
+String BLEAdvertisedDevice::getManufacturerData() {
 	return m_manufacturerData;
 } // getManufacturerData
 
@@ -81,7 +81,7 @@ std::string BLEAdvertisedDevice::getManufacturerData() {
  * @brief Get the name.
  * @return The name of the advertised device.
  */
-std::string BLEAdvertisedDevice::getName() {
+String BLEAdvertisedDevice::getName() {
 	return m_name;
 } // getName
 
@@ -115,15 +115,15 @@ int BLEAdvertisedDevice::getServiceDataCount() {
  * @brief Get the service data.
  * @return The ServiceData of the advertised device.
  */
-std::string BLEAdvertisedDevice::getServiceData() {
-	return m_serviceData.empty() ? std::string() : m_serviceData.front();
+String BLEAdvertisedDevice::getServiceData() {
+	return m_serviceData.empty() ? String() : m_serviceData.front();
 } //getServiceData
 
 /**
  * @brief Get the service data.
  * @return The ServiceData of the advertised device.
  */
-std::string BLEAdvertisedDevice::getServiceData(int i) {
+String BLEAdvertisedDevice::getServiceData(int i) {
 	return m_serviceData[i];
 } //getServiceData
 
@@ -296,7 +296,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t* payload, size_t total_len)
 
 			switch(ad_type) {
 				case ESP_BLE_AD_TYPE_NAME_CMPL: {   // Adv Data Type: 0x09
-					setName(std::string(reinterpret_cast<char*>(payload), length));
+					setName(String(reinterpret_cast<char*>(payload), length));
 					break;
 				} // ESP_BLE_AD_TYPE_NAME_CMPL
 
@@ -343,7 +343,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t* payload, size_t total_len)
 
 				// See CSS Part A 1.4 Manufacturer Specific Data
 				case ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE: {
-					setManufacturerData(std::string(reinterpret_cast<char*>(payload), length));
+					setManufacturerData(String(reinterpret_cast<char*>(payload), length));
 					break;
 				} // ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE
 
@@ -355,7 +355,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t* payload, size_t total_len)
 					uint16_t uuid = *(uint16_t*)payload;
 					setServiceDataUUID(BLEUUID(uuid));
 					if (length > 2) {
-						setServiceData(std::string(reinterpret_cast<char*>(payload + 2), length - 2));
+						setServiceData(String(reinterpret_cast<char*>(payload + 2), length - 2));
 					}
 					break;
 				} //ESP_BLE_AD_TYPE_SERVICE_DATA
@@ -368,7 +368,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t* payload, size_t total_len)
 					uint32_t uuid = *(uint32_t*) payload;
 					setServiceDataUUID(BLEUUID(uuid));
 					if (length > 4) {
-						setServiceData(std::string(reinterpret_cast<char*>(payload + 4), length - 4));
+						setServiceData(String(reinterpret_cast<char*>(payload + 4), length - 4));
 					}
 					break;
 				} //ESP_BLE_AD_TYPE_32SERVICE_DATA
@@ -381,7 +381,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t* payload, size_t total_len)
 
 					setServiceDataUUID(BLEUUID(payload, (size_t)16, false));
 					if (length > 16) {
-						setServiceData(std::string(reinterpret_cast<char*>(payload + 16), length - 16));
+						setServiceData(String(reinterpret_cast<char*>(payload + 16), length - 16));
 					}
 					break;
 				} //ESP_BLE_AD_TYPE_32SERVICE_DATA
@@ -444,10 +444,10 @@ void BLEAdvertisedDevice::setAppearance(uint16_t appearance) {
  * @brief Set the manufacturer data for this device.
  * @param [in] The discovered manufacturer data.
  */
-void BLEAdvertisedDevice::setManufacturerData(std::string manufacturerData) {
+void BLEAdvertisedDevice::setManufacturerData(String manufacturerData) {
 	m_manufacturerData     = manufacturerData;
 	m_haveManufacturerData = true;
-	char* pHex = BLEUtils::buildHexData(nullptr, (uint8_t*) m_manufacturerData.data(), (uint8_t) m_manufacturerData.length());
+	char* pHex = BLEUtils::buildHexData(nullptr, (uint8_t*) m_manufacturerData.c_str(), (uint8_t) m_manufacturerData.length());
 	log_d("- manufacturer data: %s", pHex);
 	free(pHex);
 } // setManufacturerData
@@ -457,7 +457,7 @@ void BLEAdvertisedDevice::setManufacturerData(std::string manufacturerData) {
  * @brief Set the name for this device.
  * @param [in] name The discovered name.
  */
-void BLEAdvertisedDevice::setName(std::string name) {
+void BLEAdvertisedDevice::setName(String name) {
 	m_name     = name;
 	m_haveName = true;
 	log_d("- setName(): name: %s", m_name.c_str());
@@ -507,7 +507,7 @@ void BLEAdvertisedDevice::setServiceUUID(BLEUUID serviceUUID) {
  * @brief Set the ServiceData value.
  * @param [in] data ServiceData value.
  */
-void BLEAdvertisedDevice::setServiceData(std::string serviceData) {
+void BLEAdvertisedDevice::setServiceData(String serviceData) {
 	m_serviceData.push_back(serviceData); // Save the service data that we received.
 } //setServiceData
 
@@ -537,16 +537,16 @@ void BLEAdvertisedDevice::setTXPower(int8_t txPower) {
  * @brief Create a string representation of this device.
  * @return A string representation of this device.
  */
-std::string BLEAdvertisedDevice::toString() {
-	std::string res = "Name: " + getName() + ", Address: " + getAddress().toString();
+String BLEAdvertisedDevice::toString() {
+	String res = "Name: " + getName() + ", Address: " + getAddress().toString();
 	if (haveAppearance()) {
 		char val[6];
 		snprintf(val, sizeof(val), "%d", getAppearance());
 		res += ", appearance: ";
 		res += val;
 	}
 	if (haveManufacturerData()) {
-		char *pHex = BLEUtils::buildHexData(nullptr, (uint8_t*)getManufacturerData().data(), getManufacturerData().length());
+		char *pHex = BLEUtils::buildHexData(nullptr, (uint8_t*)getManufacturerData().c_str(), getManufacturerData().length());
 		res += ", manufacturer data: ";
 		res += pHex;
 		free(pHex);

libraries/BLE/src/BLEAdvertisedDevice.h

@@ -9,6 +9,7 @@
 #define COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_
 #include "soc/soc_caps.h"
 #if SOC_BLE_SUPPORTED
+
 #include "sdkconfig.h"
 #if defined(CONFIG_BLUEDROID_ENABLED)
 #include <esp_gattc_api.h>
@@ -41,12 +42,12 @@ class BLEAdvertisedDevice {
 
 	BLEAddress  getAddress();
 	uint16_t    getAppearance();
-	std::string getManufacturerData();
-	std::string getName();
+	String getManufacturerData();
+	String getName();
 	int         getRSSI();
 	BLEScan*    getScan();
-	std::string getServiceData();
-	std::string getServiceData(int i);
+	String getServiceData();
+	String getServiceData(int i);
 	BLEUUID     getServiceDataUUID();
 	BLEUUID     getServiceDataUUID(int i);
 	BLEUUID     getServiceUUID();
@@ -71,7 +72,7 @@ class BLEAdvertisedDevice {
 	bool        haveServiceUUID();
 	bool        haveTXPower();
 
-	std::string toString();
+	String toString();
 
 private:
 	friend class BLEScan;
@@ -82,11 +83,11 @@ class BLEAdvertisedDevice {
 	void setAdFlag(uint8_t adFlag);
 	void setAdvertizementResult(uint8_t* payload);
 	void setAppearance(uint16_t appearance);
-	void setManufacturerData(std::string manufacturerData);
-	void setName(std::string name);
+	void setManufacturerData(String manufacturerData);
+	void setName(String name);
 	void setRSSI(int rssi);
 	void setScan(BLEScan* pScan);
-	void setServiceData(std::string data);
+	void setServiceData(String data);
 	void setServiceDataUUID(BLEUUID uuid);
 	void setServiceUUID(const char* serviceUUID);
 	void setServiceUUID(BLEUUID serviceUUID);
@@ -103,13 +104,13 @@ class BLEAdvertisedDevice {
 	uint8_t     m_adFlag;
 	uint16_t    m_appearance;
 	int         m_deviceType;
-	std::string m_manufacturerData;
-	std::string m_name;
+	String m_manufacturerData;
+	String m_name;
 	BLEScan*    m_pScan;
 	int         m_rssi;
 	std::vector<BLEUUID> m_serviceUUIDs;
 	int8_t      m_txPower;
-	std::vector<std::string> m_serviceData;
+	std::vector<String> m_serviceData;
 	std::vector<BLEUUID> m_serviceDataUUIDs;
 	uint8_t*	m_payload;
 	size_t		m_payloadLength = 0;