Add more API compatibility

Author: lucasssvaz

Diff for: libraries/BLE/src/BLEAddress.h

@@ -72,7 +72,7 @@ class BLEAddress : private ble_addr_t {
   // Compatibility with old API
   [[deprecated("Use getBase() instead")]]
   const uint8_t *getNative() const {
-    return &(getBase()->val);
+    return getBase()->val;
   }
 };
 

Diff for: libraries/BLE/src/BLEAdvertisedDevice.h

@@ -20,6 +20,14 @@
 #include "soc/soc_caps.h"
 #if SOC_BLE_SUPPORTED
 
+typedef enum {
+  BLE_UNKNOWN_FRAME,
+  BLE_EDDYSTONE_UUID_FRAME,
+  BLE_EDDYSTONE_URL_FRAME,
+  BLE_EDDYSTONE_TLM_FRAME,
+  BLE_FRAME_MAX
+} ble_frame_type_t;
+
 #include "btconfig.h"
 #if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
@@ -95,6 +103,9 @@ class BLEAdvertisedDevice {
   const std::vector<uint8_t>::const_iterator begin() const;
   const std::vector<uint8_t>::const_iterator end() const;
 
+  // Compatibility with Bluedroid
+  [[deprecated]] ble_frame_type_t getFrameType() const;
+
   /**
      * @brief A template to convert the service data to <type\>.
      * @tparam T The type to convert the data to.
@@ -190,14 +201,6 @@ class BLEAdvertisedDevice {
 #include "BLEScan.h"
 #include "BLEUUID.h"
 
-typedef enum {
-  BLE_UNKNOWN_FRAME,
-  BLE_EDDYSTONE_UUID_FRAME,
-  BLE_EDDYSTONE_URL_FRAME,
-  BLE_EDDYSTONE_TLM_FRAME,
-  BLE_FRAME_MAX
-} ble_frame_type_t;
-
 class BLEScan;
 /**
  * @brief A representation of a %BLE advertised device found by a scan.

Diff for: libraries/BLE/src/BLEExtAdvertising.h

@@ -81,7 +81,7 @@ class BLEExtAdvertisement {
   void setDirected(bool enable, bool high_duty = true);
   void setAnonymous(bool enable);
   void setPrimaryChannels(bool ch37, bool ch38, bool ch39);
-  void setTxPower(int8_t dbm);
+  void setTXPower(int8_t dbm);
   void setAddress(const BLEAddress &addr);
   void enableScanRequestCallback(bool enable);
   void clearData();

Diff for: libraries/BLE/src/NimBLEAdvertisedDevice.cpp

@@ -782,4 +782,23 @@ const std::vector<uint8_t>::const_iterator BLEAdvertisedDevice::end() const {
   return m_payload.cend();
 }
 
+// API compatibility with Bluedroid
+
+ble_frame_type_t BLEAdvertisedDevice::getFrameType() {
+  size_t m_payloadLength = m_payload.size();
+  for (int i = 0; i < m_payloadLength; ++i) {
+    log_d("check [%d]=0x%02X", i, m_payload[i]);
+    if (m_payload[i] == 0x16 && m_payloadLength >= i + 3 && m_payload[i + 1] == 0xAA && m_payload[i + 2] == 0xFE && m_payload[i + 3] == 0x00) {
+      return BLE_EDDYSTONE_UUID_FRAME;
+    }
+    if (m_payload[i] == 0x16 && m_payloadLength >= i + 3 && m_payload[i + 1] == 0xAA && m_payload[i + 2] == 0xFE && m_payload[i + 3] == 0x10) {
+      return BLE_EDDYSTONE_URL_FRAME;
+    }
+    if (m_payload[i] == 0x16 && m_payloadLength >= i + 3 && m_payload[i + 1] == 0xAA && m_payload[i + 2] == 0xFE && m_payload[i + 3] == 0x20) {
+      return BLE_EDDYSTONE_TLM_FRAME;
+    }
+  }
+  return BLE_UNKNOWN_FRAME;
+}
+
 #endif /* CONFIG_NIMBLE_ENABLED  && CONFIG_BT_NIMBLE_ROLE_CENTRAL */

Diff for: libraries/BLE/src/NimBLEExtAdvertising.cpp

@@ -370,9 +370,9 @@ void BLEExtAdvertisement::setScannable(bool enable) {
  * @param [in] dbm the transmission power to use in dbm.
  * @details The allowable value range depends on device hardware.
  */
-void BLEExtAdvertisement::setTxPower(int8_t dbm) {
+void BLEExtAdvertisement::setTXPower(int8_t dbm) {
   m_params.tx_power = dbm;
-}  // setTxPower
+}  // setTXPower
 
 /**
  * @brief Sets wether this advertisement should advertise as a connectable device.