Added scan parameters to GATTCentral

colemancda · colemancda · commit 9d7477fcda15 · 2022-10-02T11:51:03.000-07:00
diff --git a/Sources/GATT/GATTCentral.swift b/Sources/GATT/GATTCentral.swift
@@ -53,11 +53,26 @@ public final class GATTCentral <HostController: BluetoothHostControllerInterface
     /// Scans for peripherals that are advertising services.
     public func scan(
         filterDuplicates: Bool
+    ) async throws -> AsyncCentralScan<GATTCentral> {
+        let scanParameters = HCILESetScanParameters(
+            type: .active,
+            interval: LowEnergyScanTimeInterval(rawValue: 0x01E0)!,
+            window: LowEnergyScanTimeInterval(rawValue: 0x0030)!,
+            addressType: .public,
+            filterPolicy: .accept
+        )
+        return try await scan(filterDuplicates: filterDuplicates, parameters: scanParameters)
+    }
+    
+    /// Scans for peripherals that are advertising services.
+    public func scan(
+        filterDuplicates: Bool,
+        parameters: HCILESetScanParameters
     ) async throws -> AsyncCentralScan<GATTCentral> {
         self.log?("Scanning...")
         let stream = try await self.hostController.lowEnergyScan(
             filterDuplicates: filterDuplicates,
-            parameters: self.options.scanParameters
+            parameters: parameters
         )
         return AsyncCentralScan { [unowned self] continuation in
             // start scanning
@@ -266,28 +281,9 @@ internal extension GATTCentral {
 public struct GATTCentralOptions {
     
     public let maximumTransmissionUnit: ATTMaximumTransmissionUnit
-    
-    public let scanParameters: HCILESetScanParameters
-    
-    public init(maximumTransmissionUnit: ATTMaximumTransmissionUnit = .max,
-                scanParameters: HCILESetScanParameters = .gattCentralDefault) {
         
+    public init(maximumTransmissionUnit: ATTMaximumTransmissionUnit = .default) {
         self.maximumTransmissionUnit = maximumTransmissionUnit
-        self.scanParameters = scanParameters
-    }
-}
-
-public extension HCILESetScanParameters {
-    
-    static var gattCentralDefault: HCILESetScanParameters {
-        
-        return HCILESetScanParameters(
-            type: .active,
-            interval: LowEnergyScanTimeInterval(rawValue: 0x01E0)!,
-            window: LowEnergyScanTimeInterval(rawValue: 0x0030)!,
-            addressType: .public,
-            filterPolicy: .accept
-        )
     }
 }
 
diff --git a/Tests/GATTTests/GATTTests.swift b/Tests/GATTTests/GATTTests.swift
@@ -333,7 +333,7 @@ final class GATTTests: XCTestCase {
                 
         try await connect(
             serverOptions: .init(maximumTransmissionUnit: .default, maximumPreparedWrites: 1000),
-            clientOptions: .init(maximumTransmissionUnit: .max, scanParameters: .gattCentralDefault),
+            clientOptions: .init(maximumTransmissionUnit: .max),
             server: { peripheral in
                 let serviceAttribute = try await peripheral.add(service: service)
                 XCTAssertEqual(serviceAttribute, 1)
@@ -395,10 +395,10 @@ final class GATTTests: XCTestCase {
         )
 
         let newValue = GATTBatteryLevel(level: .min)
-                
+        
         try await connect(
             serverOptions: .init(maximumTransmissionUnit: .default, maximumPreparedWrites: 1000),
-            clientOptions: .init(maximumTransmissionUnit: .max, scanParameters: .gattCentralDefault),
+            clientOptions: .init(maximumTransmissionUnit: .max),
             server: { peripheral in
                 let serviceAttribute = try await peripheral.add(service: service)
                 XCTAssertEqual(serviceAttribute, 1)
