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

LDong-Arm · LDong-Arm · commit 29004ba69799 · 2020-04-07T16:37:26.000+01:00
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.
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/main.cpp b/BLE_GAP/source/main.cpp
@@ -771,7 +771,9 @@ int main()
 
     while (1) {
         demo.run();
+printf("sleeping\n");
         thread_sleep_for(TIME_BETWEEN_MODES_MS);
+printf("done\n");
         printf("\r\nStarting next GAP demo mode\r\n");
     };
 
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
diff --git a/BLE_SM/source/pretty_printer.h b/BLE_SM/source/pretty_printer.h
diff --git a/BLE_Thermometer/source/pretty_printer.h b/BLE_Thermometer/source/pretty_printer.h

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ inline void print_error(ble_error_t error, const char* msg)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/** print device address to the terminal */`
`68`		`-inline void print_address(const BLEProtocol::AddressBytes_t &addr)`
	`68`	`+inline void print_address(const ble::address_t &addr)`
`69`	`69`	`{`
`70`	`70`	`printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",`
`71`	`71`	`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)`
`74`	`74`	`inline void print_mac_address()`
`75`	`75`	`{`
`76`	`76`	`/* Print out device MAC address to the console*/`
`77`		`- BLEProtocol::AddressType_t addr_type;`
`78`		`- BLEProtocol::AddressBytes_t address;`
`79`		`- BLE::Instance().gap().getAddress(&addr_type, address);`
	`77`	`+ ble::own_address_type_t addr_type;`
	`78`	`+ ble::address_t address;`
	`79`	`+ BLE::Instance().gap().getAddress(addr_type, address);`
`80`	`80`	`printf("DEVICE MAC ADDRESS: ");`
`81`	`81`	`print_address(address);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ inline void print_error(ble_error_t error, const char* msg)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/** print device address to the terminal */`
`74`		`-inline void print_address(const uint8_t *addr)`
	`74`	`+inline void print_address(const ble::address_t addr)`
`75`	`75`	`{`
`76`	`76`	`printf("%02x:%02x:%02x:%02x:%02x:%02x\r\n",`
`77`	`77`	`addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);`
`@@ -80,16 +80,16 @@ inline void print_address(const uint8_t *addr)`
`80`	`80`	`inline void print_mac_address()`
`81`	`81`	`{`
`82`	`82`	`/* Print out device MAC address to the console*/`
`83`		`- BLEProtocol::AddressType_t addr_type;`
`84`		`- BLEProtocol::AddressBytes_t address;`
`85`		`- BLE::Instance().gap().getAddress(&addr_type, address);`
	`83`	`+ ble::own_address_type_t addr_type;`
	`84`	`+ ble::address_t address;`
	`85`	`+ BLE::Instance().gap().getAddress(addr_type, address);`
`86`	`86`	`printf("DEVICE MAC ADDRESS: ");`
`87`	`87`	`print_address(address);`
`88`	`88`
`89`	`89`	`if (!seeded) {`
`90`	`90`	`seeded = true;`
`91`	`91`	`/* use the address as a seed */`
`92`		`- uint8_t* random_data = address;`
	`92`	`+ uint8_t* random_data = address.data();`
`93`	`93`	`srand(((unsigned int)random_data));`
`94`	`94`	`}`
`95`	`95`	`}`