Merge pull request #491 from ps2/dev

Release 2.1.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10
 xcode_project: RileyLink.xcodeproj
 xcode_scheme: RileyLink
 script:

Cartfile

@@ -1 +1 @@
-github "LoopKit/LoopKit" == 2.1.5
+github "LoopKit/LoopKit" ~> 2.0

Cartfile.resolved

@@ -1 +1 @@
-github "LoopKit/LoopKit" "v2.1.5"
+github "LoopKit/LoopKit" "v2.2.1"

Common/Data.swift

@@ -36,6 +36,11 @@ extension Data {
         var value = value.littleEndian
         self.init(buffer: UnsafeBufferPointer(start: &value, count: 1))
     }
+
+    init<T: FixedWidthInteger>(bigEndian value: T) {
+        var value = value.bigEndian
+        self.init(buffer: UnsafeBufferPointer(start: &value, count: 1))
+    }
 }
 
 // String conversion methods, adapted from https://stackoverflow.com/questions/40276322/hex-binary-string-conversion-in-swift/40278391#40278391

Common/NumberFormatter.swift

@@ -15,4 +15,8 @@ extension NumberFormatter {
             return nil
         }
     }
+
+    func string(from number: Double) -> String? {
+        return string(from: NSNumber(value: number))
+    }
 }

Common/TimeInterval.swift

@@ -58,6 +58,14 @@ extension TimeInterval {
     var milliseconds: Double {
         return self * 1000
     }
+
+    init(hundredthsOfMilliseconds: Double) {
+        self.init(hundredthsOfMilliseconds / 100000)
+    }
+
+    var hundredthsOfMilliseconds: Double {
+        return self * 100000
+    }
 
     var minutes: Double {
         return self / 60.0

Common/TimeZone.swift

@@ -16,4 +16,15 @@ extension TimeZone {
     var fixed: TimeZone {
         return TimeZone(secondsFromGMT: secondsFromGMT())!
     }
+
+    /// This only works for fixed utc offset timezones
+    func scheduleOffset(forDate date: Date) -> TimeInterval {
+        var calendar = Calendar.current
+        calendar.timeZone = self
+        let components = calendar.dateComponents([.day , .month, .year], from: date)
+        guard let startOfSchedule = calendar.date(from: components) else {
+            fatalError("invalid date")
+        }
+        return date.timeIntervalSince(startOfSchedule)
+    }
 }

Crypto/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.7</string>
+	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MinimedKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.7</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

MinimedKit/Models/PumpColor.swift

@@ -11,4 +11,5 @@ public enum PumpColor: String {
     case clear  = "L"
     case purple = "P"
     case smoke  = "S"
+    case pink   = "H"
 }

MinimedKit/PumpManager/MinimedPumpManager.swift

@@ -203,7 +203,7 @@ public class MinimedPumpManager: RileyLinkPumpManager, PumpManager {
             pumpOps.runSession(withName: "Tune pump", using: device) { (session) in
                 do {
                     let scanResult = try session.tuneRadio()
-                    self.log.error("Device %{public}@ auto-tuned to %{public}@ MHz", device.name ?? "", String(describing: scanResult.bestFrequency))
+                    self.log.default("Device %{public}@ auto-tuned to %{public}@ MHz", device.name ?? "", String(describing: scanResult.bestFrequency))
                 } catch let error {
                     self.log.error("Device %{public}@ auto-tune failed with error: %{public}@", device.name ?? "", String(describing: error))
                     self.rileyLinkDeviceProvider.deprioritize(device, completion: nil)
@@ -230,6 +230,8 @@ public class MinimedPumpManager: RileyLinkPumpManager, PumpManager {
     private func updatePumpStatus(_ status: MySentryPumpStatusMessageBody, from device: RileyLinkDevice) {
         dispatchPrecondition(condition: .onQueue(queue))
 
+        log.default("MySentry message received")
+
         var pumpDateComponents = status.pumpDateComponents
         var glucoseDateComponents = status.glucoseDateComponents
 
@@ -407,7 +409,7 @@ public class MinimedPumpManager: RileyLinkPumpManager, PumpManager {
             return
         }
 
-        self.log.debug("Pump data is stale, fetching.")
+        self.log.default("Pump data is stale, fetching.")
 
         rileyLinkDeviceProvider.getDevices { (devices) in
             guard let device = devices.firstConnected else {

MinimedKit/PumpManager/PumpMessageSender.swift

@@ -34,7 +34,7 @@ protocol PumpMessageSender {
     ///   - retryCount: The number of times to repeat the send & listen sequence
     /// - Returns: The packet reply
     /// - Throws: LocalizedError
-    func sendAndListen(_ data: Data, repeatCount: Int, timeout: TimeInterval, retryCount: Int) throws -> RFPacket?
+    func sendAndListen(_ data: Data, repeatCount: Int, timeout: TimeInterval, retryCount: Int) throws -> RFPacket
 
     /// - Throws: LocalizedError
     func listen(onChannel channel: Int, timeout: TimeInterval) throws -> RFPacket?

MinimedKit/PumpManager/PumpOps.swift

@@ -9,6 +9,7 @@
 import Foundation
 import RileyLinkKit
 import RileyLinkBLEKit
+import os.log
 
 
 public protocol PumpOpsDelegate: class {
@@ -18,6 +19,8 @@ public protocol PumpOpsDelegate: class {
 
 public class PumpOps {
 
+    private let log = OSLog(category: "PumpOps")
+
     public let pumpSettings: PumpSettings
 
     private var pumpState: PumpState {
@@ -69,10 +72,15 @@ public class PumpOps {
         sessionQueue.async {
             let semaphore = DispatchSemaphore(value: 0)
 
-            device.runSession(withName: name) { (session) in
-                let session = PumpOpsSession(settings: self.pumpSettings, pumpState: self.pumpState, session: session, delegate: self)
+            device.runSession(withName: name) { (commandSession) in
+                let session = PumpOpsSession(settings: self.pumpSettings, pumpState: self.pumpState, session: commandSession, delegate: self)
                 self.sessionDevice = device
-                self.configureDevice(device, with: session)
+                if !commandSession.firmwareVersion.isUnknown {
+                    self.configureDevice(device, with: session)
+                } else {
+                    self.log.error("Skipping device configuration due to unknown firmware version")
+                }
+
                 block(session)
                 self.sessionDevice = nil
                 semaphore.signal()
@@ -88,10 +96,13 @@ public class PumpOps {
             return
         }
 
+        log.default("Configuring RileyLinkDevice: %{public}@", String(describing: device.deviceURI))
+
         do {
             _ = try session.configureRadio(for: pumpSettings.pumpRegion, frequency: pumpState.lastValidFrequency)
-        } catch {
+        } catch let error {
             // Ignore the error and let the block run anyway
+            log.error("Error configuring device: %{public}@", String(describing: error))
             return
         }
 
@@ -108,7 +119,9 @@ public class PumpOps {
 
         NotificationCenter.default.removeObserver(self, name: .DeviceRadioConfigDidChange, object: device)
         NotificationCenter.default.removeObserver(self, name: .DeviceConnectionStateDidChange, object: device)
-        configuredDevices.remove(device)
+
+        // TODO: Unsafe access
+        self.configuredDevices.remove(device)
     }
 
     public func getPumpState(_ completion: @escaping (_ state: PumpState) -> Void) {

MinimedKitTests/HistoryPageTests.swift

@@ -296,7 +296,7 @@ class HistoryPageTests: XCTestCase {
         XCTAssertEqual(126, events.count)
 
         let alarm = events[9] as! PumpAlarmPumpEvent
-        XCTAssertEqual("unknownType(21)", "\(alarm.alarmType)")
+        XCTAssertEqual("unknownType(rawType: 21)", "\(alarm.alarmType)")
         XCTAssertEqual(DateComponents(gregorianYear: 2007, month: 1, day: 1, hour: 0, minute: 0, second: 0), alarm.timestamp)
 
         let batteryDepletedAlarm = events[13] as! PumpAlarmPumpEvent

MinimedKitTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.7</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

MinimedKitTests/PumpOpsSynchronousTests.swift

@@ -324,7 +324,7 @@ class PumpMessageSenderStub: PumpMessageSender {
         throw PumpOpsError.noResponse(during: "Tests")
     }
 
-    func sendAndListen(_ data: Data, repeatCount: Int, timeout: TimeInterval, retryCount: Int) throws -> RFPacket? {
+    func sendAndListen(_ data: Data, repeatCount: Int, timeout: TimeInterval, retryCount: Int) throws -> RFPacket {
         guard let decoded = MinimedPacket(encodedData: data),
               let messageType = MessageType(rawValue: decoded.data[4])
         else {
@@ -356,7 +356,12 @@ class PumpMessageSenderStub: PumpMessageSender {
 
         var encoded = MinimedPacket(outgoingData: response.txData).encodedData()
         encoded.insert(contentsOf: [0, 0], at: 0)
-        return RFPacket(rfspyResponse: encoded)
+
+        guard let rfPacket = RFPacket(rfspyResponse: encoded) else {
+            throw PumpOpsError.noResponse(during: data)
+        }
+
+        return rfPacket
     }
 
     func listen(onChannel channel: Int, timeout: TimeInterval) throws -> RFPacket? {

MinimedKitUI/CommandResponseViewController.swift

@@ -283,6 +283,7 @@ extension CommandResponseViewController {
                     str += String(format: LocalizedString("Battery: %1$@ volts\n", comment: "The format string describing pump battery voltage: (1: battery voltage)"), measurementFormatter.string(from: status.batteryVolts))
                     str += String(format: LocalizedString("Suspended: %1$@\n", comment: "The format string describing pump suspended state: (1: suspended)"), String(describing: status.suspended))
                     str += String(format: LocalizedString("Bolusing: %1$@\n", comment: "The format string describing pump bolusing state: (1: bolusing)"), String(describing: status.bolusing))
+
                     response = str
                 } catch let error {
                     response = String(describing: error)

MinimedKitUI/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.7</string>
+	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MinimedKitUI/MinimedKitUI.xcassets/5xx Pink.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "5xx Pink.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MinimedKitUI/MinimedKitUI.xcassets/5xx Small Pink.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "5xx Small Pink.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MinimedKitUI/MinimedKitUI.xcassets/7xx Pink.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "7xx Pink.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MinimedKitUI/MinimedKitUI.xcassets/7xx Small Pink.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "7xx Small Pink.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MinimedKitUI/MinimedPumpSettingsViewController.swift

@@ -29,10 +29,10 @@ class MinimedPumpSettingsViewController: RileyLinkSettingsViewController {
 
         title = LocalizedString("Pump Settings", comment: "Title of the pump settings view controller")
 
-        tableView.rowHeight = UITableViewAutomaticDimension
+        tableView.rowHeight = UITableView.automaticDimension
         tableView.estimatedRowHeight = 44
 
-        tableView.sectionHeaderHeight = UITableViewAutomaticDimension
+        tableView.sectionHeaderHeight = UITableView.automaticDimension
         tableView.estimatedSectionHeaderHeight = 55
 
         tableView.register(SettingsTableViewCell.self, forCellReuseIdentifier: SettingsTableViewCell.className)

MinimedKitUI/PumpModel.swift

@@ -29,6 +29,8 @@ extension UIImage {
                 return "Purple"
             case .smoke?:
                 return "Smoke"
+            case .pink?:
+                return "Pink"
             case .none:
                 return "Outline"
             }

MinimedKitUI/Setup/MinimedPumpIDSetupViewController.swift

@@ -121,7 +121,7 @@ class MinimedPumpIDSetupViewController: SetupTableViewController {
 
         continueState = .inputSettings
 
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardDidHide), name: .UIKeyboardDidHide, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardDidHide), name: UIResponder.keyboardDidHideNotification, object: nil)
     }
 
     override func setEditing(_ editing: Bool, animated: Bool) {
@@ -332,7 +332,7 @@ class MinimedPumpIDSetupViewController: SetupTableViewController {
 extension MinimedPumpIDSetupViewController: UIPickerViewDelegate, UIPickerViewDataSource {
     private static let regionRows: [RegionCode] = [.northAmerica, .canada, .worldWide]
 
-    private static let colorRows: [PumpColor] = [.blue, .clear, .purple, .smoke]
+    private static let colorRows: [PumpColor] = [.blue, .clear, .purple, .smoke, .pink]
 
     private enum PickerViewComponent: Int {
         case region

MinimedKitUI/pl.lproj/Localizable.strings

@@ -123,7 +123,7 @@
 "No response" = "Brak odpowiedzi";
 
 /* The title of the cell showing the last idle */
-"On Idle" = "Wsrzymany";
+"On Idle" = "Wstrzymany";
 
 /* The title text for the preferred insulin data source config */
 "Preferred Data Source" = "Preferowane źródło danych";

NightscoutUploadKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.7</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

NightscoutUploadKitTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.7</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>