updated for latest Swift 3.0 syntax and ignored CommandDisallowed err…

…or for Enabling Bluetooth
PureSwift · Jun 12, 2016 · 24913a3 · 24913a3
1 parent 49ec887
commit 24913a3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 29 deletions.
diff --git a/Sources/BluetoothLinux/ATTConnection.swift b/Sources/BluetoothLinux/ATTConnection.swift
@@ -166,7 +166,7 @@ public final class ATTConnection {
     }
 
     /// Registers a callback for an opcode and returns the ID associated with that callback.
-    public func register<T: ATTProtocolDataUnit>(_ callback: T -> ()) -> UInt {
+    public func register<T: ATTProtocolDataUnit>(_ callback: (T) -> ()) -> UInt {
 
         let identifier = nextRegisterID
 
@@ -204,7 +204,7 @@ public final class ATTConnection {
     }
 
     /// Sends an error.
-    public func send(error: ATT.Error, opcode: ATTOpcode, handle: UInt16 = 0, response: (ATTErrorResponse -> ())? = nil) -> UInt? {
+    public func send(error: ATT.Error, opcode: ATTOpcode, handle: UInt16 = 0, response: ((ATTErrorResponse) -> ())? = nil) -> UInt? {
 
         let error = ATTErrorResponse(requestOpcode: opcode, attributeHandle: handle, error: error)
 
@@ -214,7 +214,7 @@ public final class ATTConnection {
     /// Adds a PDU to the queue to send.
     ///
     /// - Returns: Identifier of queued send operation or `nil` if the PDU cannot be sent.
-    public func send<T: ATTProtocolDataUnit>(PDU: T, response: T -> ()) -> UInt? {
+    public func send<T: ATTProtocolDataUnit>(PDU: T, response: (T) -> ()) -> UInt? {
 
         let attributeOpcode = T.attributeOpcode
 
@@ -373,7 +373,7 @@ public final class ATTConnection {
 
             let errorResponse = ATTErrorResponse(requestOpcode: opcode, attributeHandle: 0x00, error: .RequestNotSupported)
 
-            send(PDU: errorResponse) { _ in }
+            let _ = send(PDU: errorResponse) { _ in }
         }
 
     }
@@ -429,7 +429,7 @@ private protocol ATTSendOpcodeType {
 
     var data: [UInt8] { get }
 
-    var callback: ATTProtocolDataUnit -> () { get }
+    var callback: (ATTProtocolDataUnit) -> () { get }
 }
 
 private struct ATTSendOpcode<PDU: ATTProtocolDataUnit>: ATTSendOpcodeType {
@@ -440,11 +440,11 @@ private struct ATTSendOpcode<PDU: ATTProtocolDataUnit>: ATTSendOpcodeType {
 
     let data: [UInt8]
 
-    let response: PDU -> ()
+    let response: (PDU) -> ()
 
-    var callback: ATTProtocolDataUnit -> () { return { self.response($0 as! PDU) } }
+    var callback: (ATTProtocolDataUnit) -> () { return { self.response($0 as! PDU) } }
 
-    init(identifier: UInt, opcode: ATT.Opcode, data: [UInt8], response: PDU -> ()) {
+    init(identifier: UInt, opcode: ATT.Opcode, data: [UInt8], response: (PDU) -> ()) {
 
         self.identifier = identifier
         self.data = data
@@ -458,7 +458,7 @@ private protocol ATTNotifyType {
 
     var identifier: UInt { get }
 
-    var callback: ATTProtocolDataUnit -> () { get }
+    var callback: (ATTProtocolDataUnit) -> () { get }
 }
 
 private struct ATTNotify<PDU: ATTProtocolDataUnit>: ATTNotifyType {
@@ -467,11 +467,11 @@ private struct ATTNotify<PDU: ATTProtocolDataUnit>: ATTNotifyType {
 
     let identifier: UInt
 
-    let notify: PDU -> ()
+    let notify: (PDU) -> ()
 
-    var callback: ATTProtocolDataUnit -> () { return { self.notify($0 as! PDU) } }
+    var callback: (ATTProtocolDataUnit) -> () { return { self.notify($0 as! PDU) } }
 
-    init(identifier: UInt, notify: PDU -> ()) {
+    init(identifier: UInt, notify: (PDU) -> ()) {
 
         self.identifier = identifier
         self.notify = notify

diff --git a/Sources/BluetoothLinux/GATTServer.swift b/Sources/BluetoothLinux/GATTServer.swift
@@ -14,7 +14,7 @@ public final class GATTServer {
 
     // MARK: - Properties
 
-    public var log: (String -> ())?
+    public var log: ((String) -> ())?
 
     public var database = GATTDatabase()
 
@@ -63,40 +63,40 @@ public final class GATTServer {
     private func registerATTHandlers() {
 
         // Exchange MTU
-        connection.register(exchangeMTU)
+        let _ = connection.register(exchangeMTU)
 
         // Read By Group Type
-        connection.register(readByGroupType)
+        let _ = connection.register(readByGroupType)
 
         // Read By Type
-        connection.register(readByType)
+        let _ = connection.register(readByType)
 
         // Find Information
-        connection.register(findInformation)
+        let _ = connection.register(findInformation)
 
         // Find By Type Value
-        connection.register(findByTypeValue)
+        let _ = connection.register(findByTypeValue)
 
         // Write Request
-        connection.register(writeRequest)
+        let _ = connection.register(writeRequest)
 
         // Write Command
-        connection.register(writeCommand)
+        let _ = connection.register(writeCommand)
 
         // Read Request
-        connection.register(readRequest)
+        let _ = connection.register(readRequest)
 
         // Read Blob Request
-        connection.register(readBlobRequest)
+        let _ = connection.register(readBlobRequest)
 
         // Read Multiple Request
-        connection.register(readMultipleRequest)
+        let _ = connection.register(readMultipleRequest)
 
         // Prepare Write Request
-        connection.register(prepareWriteRequest)
+        let _ = connection.register(prepareWriteRequest)
 
         // Execute Write Request
-        connection.register(executeWriteRequest)
+        let _ = connection.register(executeWriteRequest)
     }
 
     @inline(__always)
@@ -113,7 +113,7 @@ public final class GATTServer {
 
         errorResponse(opcode, ATT.Error.UnlikelyError, handle)
 
-        do { try connection.write() }
+        do { let _ = try connection.write() }
 
         catch { print("Could not send UnlikelyError to client. (\(error))") }
 
@@ -272,7 +272,7 @@ public final class GATTServer {
         let finalMTU = max(min(pdu.clientMTU, serverMTU), UInt16(ATT.MTU.LowEnergy.Default))
 
         // Respond with the server MTU
-        connection.send(PDU: ATTMaximumTranssmissionUnitResponse(serverMTU: serverMTU)) { _ in }
+        let _ = connection.send(PDU: ATTMaximumTranssmissionUnitResponse(serverMTU: serverMTU)) { _ in }
 
         // Set MTU to minimum
         connection.maximumTransmissionUnit = Int(finalMTU)

diff --git a/Sources/BluetoothLinux/iBeacon.swift b/Sources/BluetoothLinux/iBeacon.swift
@@ -30,7 +30,8 @@ public extension Adapter {
         //print("Enabling Advertising")
 
         // start advertising
-        try enableAdvertising(timeout: commandTimeout)
+        do { try enableAdvertising(timeout: commandTimeout) }
+        catch HCIError.CommandDisallowed { /* ignore, means already turned on */ }
 
         //print("Setting iBeacon Data")
 

diff --git a/Sources/GATTServerTest/GATTServerTest.swift b/Sources/GATTServerTest/GATTServerTest.swift
@@ -73,7 +73,7 @@ private func generateDB() -> GATTDatabase {
 
     for service in TestProfile.services {
 
-        database.add(service: service)
+        let _ = database.add(service: service)
     }
 
     return database