Merge pull request #21 from PureSwift/GATTClient

- 5688f1c Implemented *Discover Characteristics by UUID* - 9386d64 Improved performance with `BitMaskOptionSet`
PureSwift · Dec 11, 2017 · 7c8c11c · 7c8c11c
2 parents 5de29e2 + c7b15c0
commit 7c8c11c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/Package.pins b/Package.pins
@@ -5,7 +5,7 @@
       "package": "Bluetooth",
       "reason": null,
       "repositoryURL": "https://github.com/PureSwift/Bluetooth.git",
-      "version": "1.5.0"
+      "version": "1.5.2"
     }
   ],
   "version": 1

diff --git a/Sources/BluetoothLinux/GATTClient.swift b/Sources/BluetoothLinux/GATTClient.swift
@@ -202,18 +202,11 @@ public final class GATTClient {
                                                            foundData: [],
                                                            completion: completion)
 
-        if let uuid = uuid {
-
-
-
-        } else {
-
-            let pdu = ATTReadByTypeRequest(startHandle: service.handle,
-                                           endHandle: service.end,
-                                           attributeType: attributeType.uuid)
-
-            send(pdu) { [unowned self] in self.readByType($0, operation: operation) }
-        }
+        let pdu = ATTReadByTypeRequest(startHandle: service.handle,
+                                       endHandle: service.end,
+                                       attributeType: attributeType.uuid)
+
+        send(pdu) { [unowned self] in self.readByType($0, operation: operation) }
     }
 
     // MARK: - Callbacks
@@ -386,6 +379,14 @@ public final class GATTClient {
                                                     handle: (handle, declaration.valueHandle))
 
                 operation.foundData.append(characteristic)
+
+                // if we specified a UUID to be searched,
+                // then call completion if it matches
+                if let operationUUID = operation.uuid {
+
+                    guard characteristic.uuid != operationUUID
+                        else { operation.success(); return }
+                }
             }
 
             // get more if possible
@@ -408,6 +409,7 @@ public final class GATTClient {
 
             } else {
 
+                // end of service
                 operation.success()
             }
         }

diff --git a/Sources/BluetoothLinux/GATTDatabase.swift b/Sources/BluetoothLinux/GATTDatabase.swift
@@ -189,15 +189,15 @@ public extension GATTDatabase {
 
         public let uuid: BluetoothUUID
 
-        public let permissions: [Permission]
+        public let permissions: BitMaskOptionSet<Permission>
 
         public var value: Data
 
         /// Defualt initializer
         fileprivate init(handle: UInt16,
                          uuid: BluetoothUUID,
                          value: Data = Data(),
-                         permissions: [Permission] = []) {
+                         permissions: BitMaskOptionSet<Permission> = []) {
 
             self.handle = handle
             self.uuid = uuid

diff --git a/Sources/BluetoothLinux/GATTServer.swift b/Sources/BluetoothLinux/GATTServer.swift
@@ -138,7 +138,8 @@ public final class GATTServer {
             else { fatalError("Could not add PDU to queue: \(response)") }
     }
 
-    private func checkPermissions(_ permissions: [ATT.AttributePermission], _ attribute: GATTDatabase.Attribute) -> ATT.Error? {
+    private func checkPermissions(_ permissions: BitMaskOptionSet<ATT.AttributePermission>,
+                                  _ attribute: GATTDatabase.Attribute) -> ATT.Error? {
 
         guard attribute.permissions != permissions else { return nil }