Add the possibility to choose the ownAddressType in the Arduino stack

Author: cparata

Diff for: src/local/BLELocalDevice.cpp

@@ -23,8 +23,8 @@
 #include "utility/L2CAPSignaling.h"
 #include "BLELocalDevice.h"
 
-BLELocalDevice::BLELocalDevice(HCITransportInterface *HCITransport) :
-  _HCITransport(HCITransport) 
+BLELocalDevice::BLELocalDevice(HCITransportInterface *HCITransport, uint8_t ownBdaddrType) :
+  _HCITransport(HCITransport), _ownBdaddrType(ownBdaddrType)
 {
   _advertisingData.setFlags(BLEFlagsGeneralDiscoverable | BLEFlagsBREDRNotSupported);
 }
@@ -76,6 +76,10 @@ int BLELocalDevice::begin()
 
   GATT.begin();
 
+  GAP.setOwnBdaddrType(_ownBdaddrType);
+
+  ATT.setOwnBdaddrType(_ownBdaddrType);
+
   return 1;
 }
 

Diff for: src/local/BLELocalDevice.h

@@ -25,9 +25,14 @@
 #include "BLEService.h"
 #include "BLEAdvertisingData.h"
 
+#define PUBLIC_ADDR                 (0)
+#define STATIC_RANDOM_ADDR          (1)
+#define RESOLVABLE_PRIVATE_ADDR     (2)
+#define NON_RESOLVABLE_PRIVATE_ADDR (3)
+
 class BLELocalDevice {
 public:
-  BLELocalDevice(HCITransportInterface *HCITransport);
+  BLELocalDevice(HCITransportInterface *HCITransport, uint8_t ownBdaddrType = STATIC_RANDOM_ADDR);
   virtual ~BLELocalDevice();
 
   virtual int begin();
@@ -90,6 +95,7 @@ class BLELocalDevice {
   HCITransportInterface *_HCITransport;
   BLEAdvertisingData _advertisingData;
   BLEAdvertisingData _scanResponseData;
+  uint8_t _ownBdaddrType;
 };
 
 extern BLELocalDevice& BLE;

Diff for: src/utility/ATT.cpp

@@ -109,7 +109,7 @@ ATTClass::~ATTClass()
 
 bool ATTClass::connect(uint8_t peerBdaddrType, uint8_t peerBdaddr[6])
 {
-  if (HCI.leCreateConn(0x0060, 0x0030, 0x00, peerBdaddrType, peerBdaddr, 0x00,
+  if (HCI.leCreateConn(0x0060, 0x0030, 0x00, peerBdaddrType, peerBdaddr, _ownBdaddrType,
                         0x0006, 0x000c, 0x0000, 0x00c8, 0x0004, 0x0006) != 0) {
     return false;
   }
@@ -1688,6 +1688,11 @@ void ATTClass::writeCmd(uint16_t connectionHandle, uint16_t handle, const uint8_
   sendReq(connectionHandle, &writeReq, 3 + dataLen, NULL);
 }
 
+void ATTClass::setOwnBdaddrType(uint8_t ownBdaddrType)
+{
+  _ownBdaddrType = ownBdaddrType;
+}
+
 #if !defined(FAKE_ATT)
 ATTClass ATTObj;
 ATTClass& ATT = ATTObj;

Diff for: src/utility/ATT.h

@@ -77,6 +77,8 @@ class ATTClass {
   virtual int writeReq(uint16_t connectionHandle, uint16_t handle, const uint8_t* data, uint8_t dataLen, uint8_t responseBuffer[]);
   virtual void writeCmd(uint16_t connectionHandle, uint16_t handle, const uint8_t* data, uint8_t dataLen);
 
+  void setOwnBdaddrType(uint8_t ownBdaddrType);
+
 private:
   virtual void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
   virtual void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
@@ -135,6 +137,8 @@ class ATTClass {
   } _pendingResp;
 
   BLEDeviceEventHandler _eventHandlers[2];
+
+  uint8_t _ownBdaddrType;
 };
 
 extern ATTClass& ATT;

Diff for: src/utility/GAP.cpp

@@ -54,7 +54,7 @@ int GAPClass::advertise(uint8_t* advData, uint8_t advDataLen, uint8_t* scanData,
 
   stopAdvertise();
 
-  if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, 0x00, 0x00, directBdaddr, 0x07, 0) != 0) {
+  if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, _ownBdaddrType, 0x00, directBdaddr, 0x07, 0) != 0) {
     return 0;
   }
 
@@ -91,8 +91,8 @@ int GAPClass::scan(bool withDuplicates)
     }
   }
 
-  // active scan, 10 ms scan interval (N * 0.625), 10 ms scan window (N * 0.625), public own address type, no filter
-  if (HCI.leSetScanParameters(0x01, 0x0010, 0x0010, 0x00, 0x00) != 0) {
+  // active scan, 10 ms scan interval (N * 0.625), 10 ms scan window (N * 0.625), public or static random own address type, no filter
+  if (HCI.leSetScanParameters(0x01, 0x0010, 0x0010, _ownBdaddrType, 0x00) != 0) {
     return false;
   }
 
@@ -270,6 +270,11 @@ bool GAPClass::matchesScanFilter(const BLEDevice& device)
   return true;
 }
 
+void GAPClass::setOwnBdaddrType(uint8_t ownBdaddrType)
+{
+  _ownBdaddrType = ownBdaddrType;
+}
+
 #if !defined(FAKE_GAP)
 GAPClass GAPObj;
 GAPClass& GAP = GAPObj;

Diff for: src/utility/GAP.h

@@ -45,6 +45,8 @@ class GAPClass {
 
   virtual void setEventHandler(BLEDeviceEvent event, BLEDeviceEventHandler eventHandler);
 
+  void setOwnBdaddrType(uint8_t ownBdaddrType);
+
 protected:
   friend class HCIClass;
 
@@ -67,6 +69,7 @@ class GAPClass {
   String _scanNameFilter;
   String _scanUuidFilter;
   String _scanAddressFilter;
+  uint8_t _ownBdaddrType;
 };
 
 extern GAPClass& GAP;