Merge pull request #103 from LoopKit/dev

ps2 · web-flow · commit 7dab897e4307 · 2018-06-07T09:51:38.000-05:00
Release 2.1
diff --git a/CGMBLEKit Example/Info.plist b/CGMBLEKit Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/CGMBLEKit.xcodeproj/project.pbxproj b/CGMBLEKit.xcodeproj/project.pbxproj
@@ -906,7 +906,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -966,7 +966,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 17;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -994,12 +994,13 @@
 		43CABE081C3506F100005705 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 16;
+				DYLIB_CURRENT_VERSION = 17;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = CGMBLEKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1016,12 +1017,13 @@
 		43CABE091C3506F100005705 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 16;
+				DYLIB_CURRENT_VERSION = 17;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = CGMBLEKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/CGMBLEKit/BluetoothManager.swift b/CGMBLEKit/BluetoothManager.swift
@@ -79,10 +79,14 @@ class BluetoothManager: NSObject {
         }
     }
 
+    var peripheralIdentifier: UUID?
+
     var peripheralManager: PeripheralManager? {
         didSet {
             oldValue?.delegate = nil
             peripheralManager?.delegate = self
+
+            peripheralIdentifier = peripheralManager?.peripheral.identifier
         }
     }
 
@@ -108,7 +112,7 @@ class BluetoothManager: NSObject {
             return
         }
 
-        if let peripheralID = self.peripheral?.identifier, let peripheral = manager.retrievePeripherals(withIdentifiers: [peripheralID]).first {
+        if let peripheralID = peripheralIdentifier, let peripheral = manager.retrievePeripherals(withIdentifiers: [peripheralID]).first {
             log.debug("Re-connecting to known peripheral %{public}@", peripheral.identifier.uuidString)
             self.peripheral = peripheral
             self.manager.connect(peripheral)
diff --git a/CGMBLEKit/Info.plist b/CGMBLEKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/CGMBLEKit/Messages/GlucoseBackfillMessage.swift b/CGMBLEKit/Messages/GlucoseBackfillMessage.swift
@@ -110,8 +110,13 @@ struct GlucoseBackfillFrameBuffer {
             from: glucoseData.startIndex,
             to: glucoseData.endIndex,
             by: GlucoseSubMessage.size
-        ).map {
-            return GlucoseSubMessage(data: glucoseData[$0..<$0.advanced(by: GlucoseSubMessage.size)])!
+        ).compactMap {
+            let range = $0..<$0.advanced(by: GlucoseSubMessage.size)
+            guard glucoseData.endIndex >= range.endIndex else {
+                return nil
+            }
+
+            return GlucoseSubMessage(data: glucoseData[range])
         }
     }
 }
diff --git a/CGMBLEKit/Messages/GlucoseRxMessage.swift b/CGMBLEKit/Messages/GlucoseRxMessage.swift
@@ -19,7 +19,7 @@ public struct GlucoseSubMessage: TransmitterRxMessage {
     public let trend: Int8
 
     init?(data: Data) {
-        guard data.count == GlucoseSubMessage.size else {
+        guard data.count >= GlucoseSubMessage.size else {
             return nil
         }
 
@@ -50,18 +50,18 @@ public struct GlucoseRxMessage: TransmitterRxMessage {
     public let glucose: GlucoseSubMessage
 
     init?(data: Data) {
-        guard data.count == 16 && data.isCRCValid else {
+        guard data.count >= 16 && data.isCRCValid else {
             return nil
         }
 
-        guard data.starts(with: .glucoseRx) else {
+        guard data.starts(with: .glucoseRx) || data.starts(with: .glucoseG6Rx) else {
             return nil
         }
 
         status = data[1]
         sequence = data[2..<6].toInt()
 
-        guard let glucose = GlucoseSubMessage(data: data[6..<14]) else {
+        guard let glucose = GlucoseSubMessage(data: data[6...]) else {
             return nil
         }
         self.glucose = glucose
diff --git a/CGMBLEKit/Opcode.swift b/CGMBLEKit/Opcode.swift
@@ -14,11 +14,13 @@ enum Opcode: UInt8 {
     case authRequestRx = 0x03
     case authChallengeTx = 0x04
     case authChallengeRx = 0x05
-    case keepAlive = 0x06
+    case keepAlive = 0x06 // auth; setAdvertisementParametersTx for control
     case bondRequest = 0x07
     
     // Control
     case disconnectTx = 0x09
+    
+    case setAdvertisementParametersRx = 0x1c
 
     case firmwareVersionTx = 0x20
     case firmwareVersionRx = 0x21
@@ -45,6 +47,9 @@ enum Opcode: UInt8 {
 
     case transmitterVersionTx = 0x4a
     case transmitterVersionRx = 0x4b
+    
+    case glucoseG6Tx = 0x4e
+    case glucoseG6Rx = 0x4f
 
     case glucoseBackfillTx = 0x50
     case glucoseBackfillRx = 0x51
diff --git a/CGMBLEKit/PeripheralManager.swift b/CGMBLEKit/PeripheralManager.swift
@@ -45,7 +45,7 @@ class PeripheralManager: NSObject {
     /// Any error surfaced during the active operation
     private var commandError: Error?
 
-    unowned let central: CBCentralManager
+    private(set) weak var central: CBCentralManager?
 
     let configuration: Configuration
 
@@ -99,7 +99,7 @@ protocol PeripheralManagerDelegate: class {
 // MARK: - Operation sequence management
 extension PeripheralManager {
     func configureAndRun(_ block: @escaping (_ manager: PeripheralManager) -> Void) -> (() -> Void) {
-        return { [unowned self] in
+        return {
             if !self.needsConfiguration && self.peripheral.services == nil {
                 self.log.debug("Configured peripheral has no services. Reconfiguring…")
             }
@@ -168,7 +168,7 @@ extension PeripheralManager {
     func runCommand(timeout: TimeInterval, command: () -> Void) throws {
         // Prelude
         dispatchPrecondition(condition: .onQueue(queue))
-        guard central.state == .poweredOn && peripheral.state == .connected else {
+        guard central?.state == .poweredOn && peripheral.state == .connected else {
             throw PeripheralManagerError.notReady
         }
 
diff --git a/CGMBLEKit/Transmitter.swift b/CGMBLEKit/Transmitter.swift
@@ -90,10 +90,11 @@ public final class Transmitter: BluetoothManagerDelegate {
 
     private let delegateQueue = DispatchQueue(label: "com.loudnate.CGMBLEKit.delegateQueue", qos: .utility)
 
-    public init(id: String, passiveModeEnabled: Bool = false) {
+    public init(id: String, peripheralIdentifier: UUID? = nil, passiveModeEnabled: Bool = false) {
         self.id = TransmitterID(id: id)
         self.passiveModeEnabled = passiveModeEnabled
 
+        bluetoothManager.peripheralIdentifier = peripheralIdentifier
         bluetoothManager.delegate = self
     }
 
@@ -111,6 +112,15 @@ public final class Transmitter: BluetoothManagerDelegate {
         return bluetoothManager.isScanning
     }
 
+    public var peripheralIdentifier: UUID? {
+        get {
+            return bluetoothManager.peripheralIdentifier
+        }
+        set {
+            bluetoothManager.peripheralIdentifier = newValue
+        }
+    }
+
     public var stayConnected: Bool {
         get {
             return bluetoothManager.stayConnected
@@ -220,7 +230,7 @@ public final class Transmitter: BluetoothManagerDelegate {
         guard response.count > 0 else { return }
 
         switch Opcode(rawValue: response[0]) {
-        case .glucoseRx?:
+        case .glucoseRx?, .glucoseG6Rx?:
             if  let glucoseMessage = GlucoseRxMessage(data: response),
                 let timeMessage = lastTimeMessage,
                 let activationDate = activationDate
diff --git a/CGMBLEKitTests/GlucoseBackfillMessageTests.swift b/CGMBLEKitTests/GlucoseBackfillMessageTests.swift
@@ -62,4 +62,12 @@ class GlucoseBackfillMessageTests: XCTestCase {
         XCTAssertEqual(.known(.ok), CalibrationState(rawValue: messages[4].state))
         XCTAssertEqual(-08, messages[4].trend)
     }
+
+    func testMalformedBackfill() {
+        var buffer = GlucoseBackfillFrameBuffer(identifier: 0)
+        buffer.append(Data(hexadecimalString: "0100bc460000b7ff52008b0006eee30053008500")!)
+        buffer.append(Data(hexadecimalString: "020006eb0f025300800006ee3a0353007e0006")!)
+
+        XCTAssertEqual(3, buffer.glucose.count)
+    }
 }
diff --git a/CGMBLEKitTests/Info.plist b/CGMBLEKitTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ResetTransmitter/Info.plist b/ResetTransmitter/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ResetTransmitter/Locked.swift b/ResetTransmitter/Locked.swift
@@ -34,7 +34,7 @@ internal class Locked<T> {
     func mutate(_ changes: (_ value: inout T) -> Void) -> T {
         os_unfair_lock_lock(&lock)
         defer { os_unfair_lock_unlock(&lock) }
-        changes(&value)
-        return value
+        changes(&_value)
+        return _value
     }
 }
diff --git a/ResetTransmitter/ResetManager.swift b/ResetTransmitter/ResetManager.swift
@@ -24,6 +24,7 @@ class ResetManager {
             let oldValue = state
 
             if case .resetting(let transmitter) = oldValue {
+                transmitter.stayConnected = false
                 transmitter.stopScanning()
                 transmitter.delegate = nil
                 transmitter.commandSource = nil

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,14 @@ class BluetoothManager: NSObject {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+ var peripheralIdentifier: UUID?`
	`83`	`+`
`82`	`84`	`var peripheralManager: PeripheralManager? {`
`83`	`85`	`didSet {`
`84`	`86`	`oldValue?.delegate = nil`
`85`	`87`	`peripheralManager?.delegate = self`
	`88`	`+`
	`89`	`+ peripheralIdentifier = peripheralManager?.peripheral.identifier`
`86`	`90`	`}`
`87`	`91`	`}`
`88`	`92`
`@@ -108,7 +112,7 @@ class BluetoothManager: NSObject {`
`108`	`112`	`return`
`109`	`113`	`}`
`110`	`114`
`111`		`- if let peripheralID = self.peripheral?.identifier, let peripheral = manager.retrievePeripherals(withIdentifiers: [peripheralID]).first {`
	`115`	`+ if let peripheralID = peripheralIdentifier, let peripheral = manager.retrievePeripherals(withIdentifiers: [peripheralID]).first {`
`112`	`116`	`log.debug("Re-connecting to known peripheral %{public}@", peripheral.identifier.uuidString)`
`113`	`117`	`self.peripheral = peripheral`
`114`	`118`	`self.manager.connect(peripheral)`
Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,13 @@ struct GlucoseBackfillFrameBuffer {`
`110`	`110`	`from: glucoseData.startIndex,`
`111`	`111`	`to: glucoseData.endIndex,`
`112`	`112`	`by: GlucoseSubMessage.size`
`113`		`- ).map {`
`114`		`- return GlucoseSubMessage(data: glucoseData[$0..<$0.advanced(by: GlucoseSubMessage.size)])!`
	`113`	`+ ).compactMap {`
	`114`	`+ let range = $0..<$0.advanced(by: GlucoseSubMessage.size)`
	`115`	`+ guard glucoseData.endIndex >= range.endIndex else {`
	`116`	`+ return nil`
	`117`	`+ }`
	`118`	`+`
	`119`	`+ return GlucoseSubMessage(data: glucoseData[range])`
`115`	`120`	`}`
`116`	`121`	`}`
`117`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public struct GlucoseSubMessage: TransmitterRxMessage {`
`19`	`19`	`public let trend: Int8`
`20`	`20`
`21`	`21`	`init?(data: Data) {`
`22`		`- guard data.count == GlucoseSubMessage.size else {`
	`22`	`+ guard data.count >= GlucoseSubMessage.size else {`
`23`	`23`	`return nil`
`24`	`24`	`}`
`25`	`25`
`@@ -50,18 +50,18 @@ public struct GlucoseRxMessage: TransmitterRxMessage {`
`50`	`50`	`public let glucose: GlucoseSubMessage`
`51`	`51`
`52`	`52`	`init?(data: Data) {`
`53`		`- guard data.count == 16 && data.isCRCValid else {`
	`53`	`+ guard data.count >= 16 && data.isCRCValid else {`
`54`	`54`	`return nil`
`55`	`55`	`}`
`56`	`56`
`57`		`- guard data.starts(with: .glucoseRx) else {`
	`57`	`+ guard data.starts(with: .glucoseRx) \|\| data.starts(with: .glucoseG6Rx) else {`
`58`	`58`	`return nil`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`status = data[1]`
`62`	`62`	`sequence = data[2..<6].toInt()`
`63`	`63`
`64`		`- guard let glucose = GlucoseSubMessage(data: data[6..<14]) else {`
	`64`	`+ guard let glucose = GlucoseSubMessage(data: data[6...]) else {`
`65`	`65`	`return nil`
`66`	`66`	`}`
`67`	`67`	`self.glucose = glucose`
Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,12 @@ class GlucoseBackfillMessageTests: XCTestCase {`
`62`	`62`	`XCTAssertEqual(.known(.ok), CalibrationState(rawValue: messages[4].state))`
`63`	`63`	`XCTAssertEqual(-08, messages[4].trend)`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ func testMalformedBackfill() {`
	`67`	`+ var buffer = GlucoseBackfillFrameBuffer(identifier: 0)`
	`68`	`+ buffer.append(Data(hexadecimalString: "0100bc460000b7ff52008b0006eee30053008500")!)`
	`69`	`+ buffer.append(Data(hexadecimalString: "020006eb0f025300800006ee3a0353007e0006")!)`
	`70`	`+`
	`71`	`+ XCTAssertEqual(3, buffer.glucose.count)`
	`72`	`+ }`
`65`	`73`	`}`