Update address types to align with the latest Mbed OS API changes

In ARMmbed/mbed-os#12730 we have removed legacy address-related types (BLEProtocol:: namespace) in favour of new once in ble:: namespace. This commit updates examples so they continue to work the latest Mbed OS.
ARMmbed · Sep 10, 2020 · e76a53a · e76a53a
1 parent a866f9f
commit e76a53a
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 75 deletions.
diff --git a/BLE_BatteryLevel/source/pretty_printer.h b/BLE_BatteryLevel/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_Beacon/source/pretty_printer.h b/BLE_Beacon/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_Button/source/pretty_printer.h b/BLE_Button/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_GAP/source/pretty_printer.h b/BLE_GAP/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_GAPButton/source/pretty_printer.h b/BLE_GAPButton/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_GattClient/source/pretty_printer.h b/BLE_GattClient/source/pretty_printer.h
@@ -71,7 +71,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const uint8_t *addr)
+inline void print_address(const ble::address_t addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -80,16 +80,16 @@ inline void print_address(const uint8_t *addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 
  if (!seeded) {
  seeded = true;
  /* use the address as a seed */
- uint8_t* random_data = address;
+ uint8_t* random_data = address.data();
  srand(*((unsigned int*)random_data));
  }
 }

diff --git a/BLE_GattServer/source/pretty_printer.h b/BLE_GattServer/source/pretty_printer.h
@@ -71,7 +71,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const uint8_t *addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -80,16 +80,16 @@ inline void print_address(const uint8_t *addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 
  if (!seeded) {
  seeded = true;
  /* use the address as a seed */
- uint8_t* random_data = address;
+ uint8_t* random_data = address.data();
  srand(*((unsigned int*)random_data));
  }
 }

diff --git a/BLE_HeartRate/source/pretty_printer.h b/BLE_HeartRate/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_LED/source/pretty_printer.h b/BLE_LED/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const BLEProtocol::AddressBytes_t &addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ inline void print_address(const BLEProtocol::AddressBytes_t &addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_LEDBlinker/source/pretty_printer.h b/BLE_LEDBlinker/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-void print_address(const uint8_t *addr)
+void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ void print_address(const uint8_t *addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_PeriodicAdvertising/source/pretty_printer.h b/BLE_PeriodicAdvertising/source/pretty_printer.h
@@ -68,7 +68,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-inline void print_address(const uint8_t *addr)
+inline void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -77,16 +77,16 @@ inline void print_address(const uint8_t *addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 
  if (!seeded) {
  seeded = true;
  /* use the address as a seed */
- uint8_t* random_data = address;
+ uint8_t* random_data = address.data();
  srand(*((unsigned int*)random_data));
  }
 }

diff --git a/BLE_Privacy/source/main.cpp b/BLE_Privacy/source/main.cpp
@@ -172,16 +172,16 @@ class PrivacyDevice : private mbed::NonCopyable<PrivacyDevice>,
  void print_local_address()
  {
  /* show what address we are using now */
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t addr;
- _ble.gap().getAddress(&addr_type, addr);
+ ble::own_address_type_t addr_type;
+ ble::address_t addr;
+ _ble.gap().getAddress(addr_type, addr);
  printf("Device address: ");
  print_address(addr);
 
  if (!_seeded) {
  _seeded = true;
  /* use the address as a seed */
- uint8_t* random_data = addr;
+ uint8_t* random_data = addr.data();
  srand(*((unsigned int*)random_data));
  }
  }

diff --git a/BLE_Privacy/source/pretty_printer.h b/BLE_Privacy/source/pretty_printer.h
@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)
 }
 
 /** print device address to the terminal */
-void print_address(const uint8_t *addr)
+void print_address(const ble::address_t &addr)
 {
  printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",
  addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
@@ -74,9 +74,9 @@ void print_address(const uint8_t *addr)
 inline void print_mac_address()
 {
  /* Print out device MAC address to the console*/
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t address;
- BLE::Instance().gap().getAddress(&addr_type, address);
+ ble::own_address_type_t addr_type;
+ ble::address_t address;
+ BLE::Instance().gap().getAddress(addr_type, address);
  printf("DEVICE MAC ADDRESS: ");
  print_address(address);
 }

diff --git a/BLE_SM/source/main.cpp b/BLE_SM/source/main.cpp
@@ -48,7 +48,7 @@ const static disconnect_call_t disconnect_call = &Gap::disconnect;
 /* for demonstration purposes we will store the peer device address
  * of the device that connects to us in the first demonstration
  * so we can use its address to reconnect to it later */
-static BLEProtocol::AddressBytes_t peer_address;
+static ble::address_t peer_address;
 
 /** Base class for both peripheral and central. The same class that provides
  * the logic for the application also implements the SecurityManagerEventHandler
@@ -61,7 +61,7 @@ class SMDevice : private mbed::NonCopyable<SMDevice>,
  public ble::Gap::EventHandler
 {
 public:
- SMDevice(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address) :
+ SMDevice(BLE &ble, events::EventQueue &event_queue, ble::address_t &peer_address) :
  _led1(LED1, 0),
  _ble(ble),
  _event_queue(event_queue),
@@ -180,10 +180,7 @@ class SMDevice : private mbed::NonCopyable<SMDevice>,
  _ble.gap().setEventHandler(this);
 
  /* print device address */
- BLEProtocol::AddressType_t addr_type;
- BLEProtocol::AddressBytes_t addr;
- _ble.gap().getAddress(&addr_type, addr);
- print_address(addr);
+ print_mac_address();
 
  /* start test in 500 ms */
  _event_queue.call_in(500, this, &SMDevice::start);
@@ -278,7 +275,7 @@ class SMDevice : private mbed::NonCopyable<SMDevice>,
 protected:
  BLE &_ble;
  events::EventQueue &_event_queue;
- BLEProtocol::AddressBytes_t &_peer_address;
+ ble::address_t &_peer_address;
  ble::connection_handle_t _handle;
  bool _is_connecting;
 };
@@ -287,7 +284,7 @@ class SMDevice : private mbed::NonCopyable<SMDevice>,
  * a change in link security. */
 class SMDevicePeripheral : public SMDevice {
 public:
- SMDevicePeripheral(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address)
+ SMDevicePeripheral(BLE &ble, events::EventQueue &event_queue, ble::address_t &peer_address)
  : SMDevice(ble, event_queue, peer_address) { }
 
  virtual void start()
@@ -352,7 +349,7 @@ class SMDevicePeripheral : public SMDevice {
 
  /* remember the device that connects to us now so we can connect to it
  * during the next demonstration */
- memcpy(_peer_address, event.getPeerAddress().data(), sizeof(_peer_address));
+ _peer_address = event.getPeerAddress();
 
  printf("Connected to peer: ");
  print_address(event.getPeerAddress().data());
@@ -379,7 +376,7 @@ class SMDevicePeripheral : public SMDevice {
 /** A central device will scan, connect to a peer and request pairing. */
 class SMDeviceCentral : public SMDevice {
 public:
- SMDeviceCentral(BLE &ble, events::EventQueue &event_queue, BLEProtocol::AddressBytes_t &peer_address)
+ SMDeviceCentral(BLE &ble, events::EventQueue &event_queue, ble::address_t &peer_address)
  : SMDevice(ble, event_queue, peer_address) { }
 
  virtual void start()
@@ -403,7 +400,7 @@ class SMDeviceCentral : public SMDevice {
  printf("Please advertise\r\n");
 
  printf("Scanning for: ");
- print_address(_peer_address);
+ print_address(_peer_address.data());
  }
 
 private:
@@ -418,7 +415,7 @@ class SMDeviceCentral : public SMDevice {
  }
 
  /* parse the advertising payload, looking for a discoverable device */
- if (memcmp(event.getPeerAddress().data(), _peer_address, sizeof(_peer_address)) == 0) {
+ if (event.getPeerAddress() == _peer_address) {
  ble_error_t error = _ble.gap().stopScan();
 
  if (error) {