Advertise ESP23 with Bluetooth address

Author: colemancda

esp32-led-blink-sdk/main/Main.swift

@@ -34,16 +34,18 @@ func app_main() {
         let flags: GAPFlags = [.lowEnergyGeneralDiscoverableMode, .notSupportedBREDR]
         let advertisement = LowEnergyAdvertisingData(beacon: beacon, flags: flags)
         try bluetooth.gap.setAdvertisement(advertisement)
-        print("Configured advertisement")
+
+        // read address
+        let address = try bluetooth.hostController.address()
 
         // set scan response
-        let name = GAPShortLocalName(name: "ESP32-C6")
+        let name = GAPShortLocalName(name: "ESP32-C6 " + address.description)
         let scanResponse: LowEnergyAdvertisingData = GAPDataEncoder.encode(name)
         try bluetooth.gap.setScanResponse(scanResponse)
-        print("Configured scan response")
 
         // start advertisement
         try bluetooth.gap.startAdvertising()
+        print("Advertising as \(name)")
     }
     catch {
         print("Bluetooth error \(error.rawValue)")

esp32-led-blink-sdk/main/NimBLE.swift

@@ -12,24 +12,18 @@
 struct NimBLE: ~Copyable {
 
     init() throws(ESPError) {
-        //esp_nimble_hci_init()
-        try nvs_flash_init().throwsESPError()
-        print("nvs_flash_init()")
-        try nimble_port_init().throwsESPError()
-        print("nimble_port_init()")
-        //var options = esp_bt_controller_config_t()
-        //try esp_bt_controller_init(&options).throwsESPError()
-        //print("esp_bt_controller_init()")
-        //try esp_bt_controller_enable(ESP_BT_MODE_BLE).throwsESPError()
-       // print("esp_bt_controller_enable()")
+       try nvs_flash_init().throwsESPError()
+       try nimble_port_init().throwsESPError()
        nimble_port_freertos_init(nimble_host_task)
     }
-
+    
     deinit {
-        //esp_nimble_hci_deinit()
+        nimble_port_freertos_deinit()
     }
 
     var gap = GAP()
+
+    var hostController = HostController()
 }
 
 @_silgen_name("nvs_flash_init")
@@ -42,10 +36,10 @@ internal func nimble_port_init() -> Int32
 internal func nimble_port_run() -> Int32
 
 @_silgen_name("nimble_port_freertos_init")
-internal func nimble_port_freertos_init(_ function: (UnsafeMutableRawPointer) -> ()) -> Int32
+internal func nimble_port_freertos_init(_ function: (UnsafeMutableRawPointer) -> ())
 
 @_silgen_name("nimble_port_freertos_deinit")
-internal func nimble_port_freertos_deinit() -> Int32
+internal func nimble_port_freertos_deinit()
 
 internal func nimble_host_task(_ parameters: UnsafeMutableRawPointer) {
     print("BLE Host Task Started")
@@ -103,4 +97,19 @@ public struct GAP: ~Copyable {
 
 internal func _gap_callback(event: UnsafeMutablePointer<ble_gap_event>?, context: UnsafeMutableRawPointer?) -> Int32 {
     return 0
+}
+
+public struct HostController: ~Copyable {
+    
+    func address(
+        type: LowEnergyAddressType = .public
+    ) throws(NimBLEError) -> BluetoothAddress {
+        var address = BluetoothAddress.zero
+        try withUnsafeMutablePointer(to: &address) {
+            $0.withMemoryRebound(to: UInt8.self, capacity: 6) {
+                ble_hs_id_copy_addr(type.rawValue, $0, nil)
+            }
+        }.throwsError()
+        return address
+    }
 }