Ported nkolban/pull/994

Author: COM8

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+    "files.associations": {
+        "*.txt": "plaintext",
+        "*.tcc": "cpp",
+        "optional": "cpp",
+        "istream": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "system_error": "cpp",
+        "array": "cpp",
+        "functional": "cpp",
+        "regex": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp"
+    }
+}

cpp_utils/BLEAddress.cpp

@@ -7,25 +7,26 @@
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
-#include "BLEAddress.h"
-#include <string>
-#include <sstream>
-#include <iomanip>
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
+#include <iomanip>
+#include <sstream>
+#include <string>
+
+#include "BLEAddress.h"
 #ifdef ARDUINO_ARCH_ESP32
 #include "esp32-hal-log.h"
 #endif
 
-
 /**
  * @brief Create an address from the native ESP32 representation.
  * @param [in] address The native representation.
  */
-BLEAddress::BLEAddress(esp_bd_addr_t address) {
-	memcpy(m_address, address, ESP_BD_ADDR_LEN);
-} // BLEAddress
-
+BLEAddress::BLEAddress(esp_bd_addr_t address, esp_ble_wl_addr_type_t type) {
+    m_type = type;
+    memcpy(m_address, address, ESP_BD_ADDR_LEN);
+}  // BLEAddress
 
 /**
  * @brief Create an address from a hex string
@@ -38,38 +39,32 @@ BLEAddress::BLEAddress(esp_bd_addr_t address) {
  *
  * @param [in] stringAddress The hex representation of the address.
  */
-BLEAddress::BLEAddress(std::string stringAddress) {
-	if (stringAddress.length() != 17) return;
-
-	int data[6];
-	sscanf(stringAddress.c_str(), "%x:%x:%x:%x:%x:%x", &data[0], &data[1], &data[2], &data[3], &data[4], &data[5]);
-	m_address[0] = (uint8_t) data[0];
-	m_address[1] = (uint8_t) data[1];
-	m_address[2] = (uint8_t) data[2];
-	m_address[3] = (uint8_t) data[3];
-	m_address[4] = (uint8_t) data[4];
-	m_address[5] = (uint8_t) data[5];
-} // BLEAddress
+BLEAddress::BLEAddress(std::string stringAddress, esp_ble_wl_addr_type_t type) {
+    m_type = type;
+    if (stringAddress.length() != 17) return;
 
+    int data[6];
+    sscanf(stringAddress.c_str(), "%x:%x:%x:%x:%x:%x", &data[0], &data[1], &data[2], &data[3], &data[4], &data[5]);
+    m_address[0] = (uint8_t)data[0];
+    m_address[1] = (uint8_t)data[1];
+    m_address[2] = (uint8_t)data[2];
+    m_address[3] = (uint8_t)data[3];
+    m_address[4] = (uint8_t)data[4];
+    m_address[5] = (uint8_t)data[5];
+}  // BLEAddress
 
 /**
  * @brief Determine if this address equals another.
  * @param [in] otherAddress The other address to compare against.
  * @return True if the addresses are equal.
  */
-bool BLEAddress::equals(BLEAddress otherAddress) {
-	return memcmp(otherAddress.getNative(), m_address, 6) == 0;
-} // equals
-
+bool BLEAddress::equals(BLEAddress otherAddress) { return memcmp(otherAddress.getNative(), m_address, 6) == 0 && m_type == otherAddress.m_type; }  // equals
 
 /**
  * @brief Return the native representation of the address.
  * @return The native representation of the address.
  */
-esp_bd_addr_t *BLEAddress::getNative() {
-	return &m_address;
-} // getNative
-
+esp_bd_addr_t *BLEAddress::getNative() { return &m_address; }  // getNative
 
 /**
  * @brief Convert a BLE address to a string.
@@ -83,13 +78,15 @@ esp_bd_addr_t *BLEAddress::getNative() {
  * @return The string representation of the address.
  */
 std::string BLEAddress::toString() {
-	std::stringstream stream;
-	stream << std::setfill('0') << std::setw(2) << std::hex << (int) ((uint8_t*) (m_address))[0] << ':';
-	stream << std::setfill('0') << std::setw(2) << std::hex << (int) ((uint8_t*) (m_address))[1] << ':';
-	stream << std::setfill('0') << std::setw(2) << std::hex << (int) ((uint8_t*) (m_address))[2] << ':';
-	stream << std::setfill('0') << std::setw(2) << std::hex << (int) ((uint8_t*) (m_address))[3] << ':';
-	stream << std::setfill('0') << std::setw(2) << std::hex << (int) ((uint8_t*) (m_address))[4] << ':';
-	stream << std::setfill('0') << std::setw(2) << std::hex << (int) ((uint8_t*) (m_address))[5];
-	return stream.str();
-} // toString
+    std::stringstream stream;
+    stream << std::setfill('0') << std::setw(2) << std::hex << (int)((uint8_t *)(m_address))[0] << ':';
+    stream << std::setfill('0') << std::setw(2) << std::hex << (int)((uint8_t *)(m_address))[1] << ':';
+    stream << std::setfill('0') << std::setw(2) << std::hex << (int)((uint8_t *)(m_address))[2] << ':';
+    stream << std::setfill('0') << std::setw(2) << std::hex << (int)((uint8_t *)(m_address))[3] << ':';
+    stream << std::setfill('0') << std::setw(2) << std::hex << (int)((uint8_t *)(m_address))[4] << ':';
+    stream << std::setfill('0') << std::setw(2) << std::hex << (int)((uint8_t *)(m_address))[5];
+    return stream.str();
+}  // toString
+
+esp_ble_wl_addr_type_t BLEAddress::getType() const { return m_type; }
 #endif

cpp_utils/BLEAddress.h

@@ -9,25 +9,27 @@
 #define COMPONENTS_CPP_UTILS_BLEADDRESS_H_
 #include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
-#include <esp_gap_ble_api.h> // ESP32 BLE
-#include <string>
+#include <esp_gap_ble_api.h>  // ESP32 BLE
 
+#include <string>
 
 /**
  * @brief A %BLE device address.
  *
  * Every %BLE device has a unique address which can be used to identify it and form connections.
  */
 class BLEAddress {
-public:
-	BLEAddress(esp_bd_addr_t address);
-	BLEAddress(std::string stringAddress);
-	bool           equals(BLEAddress otherAddress);
-	esp_bd_addr_t* getNative();
-	std::string    toString();
+   public:
+    BLEAddress(esp_bd_addr_t address, esp_ble_wl_addr_type_t type = BLE_WL_ADDR_TYPE_RANDOM);
+    BLEAddress(std::string stringAddress, esp_ble_wl_addr_type_t type = BLE_WL_ADDR_TYPE_RANDOM);
+    bool equals(BLEAddress otherAddress);
+    esp_bd_addr_t* getNative();
+    std::string toString();
+    esp_ble_wl_addr_type_t getType() const;
 
-private:
-	esp_bd_addr_t m_address;
+   private:
+    esp_bd_addr_t m_address;
+    esp_ble_wl_addr_type_t m_type;
 };
 
 #endif /* CONFIG_BT_ENABLED */