BLE: Allow custom MAC in beacon packet definition

And change the MAC for micro:bit example.
AdaCore · Jul 13, 2018 · 556ea3e · 556ea3e
1 parent 6efe216
commit 556ea3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/examples/MicroBit/src/beacon.adb b/examples/MicroBit/src/beacon.adb
@@ -54,10 +54,12 @@ package body Beacon is
         Make_UUID ((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16));
    begin
 
-      Beacon_Packet := Make_Beacon_Packet (UUID  => Beacon_UUID,
-                                           Major => 0,
-                                           Minor => 0,
-                                           Power => 0);
+      Beacon_Packet := Make_Beacon_Packet
+        (MAC   => (16#A1#, 16#AD#, 16#A1#, 16#AD#, 16#A1#, 16#AD#),
+         UUID  => Beacon_UUID,
+         Major => 0,
+         Minor => 0,
+         Power => 0);
 
       --  Setup high frequency clock for BLE transmission
       Set_High_Freq_Source (HFCLK_RC);

diff --git a/middleware/src/BLE/bluetooth_low_energy-beacon.adb b/middleware/src/BLE/bluetooth_low_energy-beacon.adb
@@ -32,7 +32,8 @@
 
 package body Bluetooth_Low_Energy.Beacon is
 
-   function Make_Beacon_Packet (UUID         : BLE_UUID;
+   function Make_Beacon_Packet (MAC          : UInt8_Array;
+                                UUID         : BLE_UUID;
                                 Major, Minor : UInt16;
                                 Power        : Integer_8)
                                 return BLE_Packet
@@ -41,7 +42,7 @@ package body Bluetooth_Low_Energy.Beacon is
    begin
       Set_Header (Pck, 16#42#);
       --  MAC
-      Push (Pck, (16#FE#, 16#CA#, 16#EF#, 16#BE#, 16#AD#, 16#DE#));
+      Push (Pck, MAC);
       --  Flag length
       Push (Pck, UInt8 (2));
       --  Flag type

diff --git a/middleware/src/BLE/bluetooth_low_energy-beacon.ads b/middleware/src/BLE/bluetooth_low_energy-beacon.ads
@@ -34,7 +34,8 @@ with Interfaces;                   use Interfaces;
 
 package Bluetooth_Low_Energy.Beacon is
 
-   function Make_Beacon_Packet (UUID         : BLE_UUID;
+   function Make_Beacon_Packet (MAC          : UInt8_Array;
+                                UUID         : BLE_UUID;
                                 Major, Minor : UInt16;
                                 Power        : Integer_8) return BLE_Packet;
 end Bluetooth_Low_Energy.Beacon;