Merge pull request #5 from loudnate/poll-reservoir

Poll reservoir when sentry listening is unavailable

Author: loudnate

Cartfile

@@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3
 github "loudnate/xDripG5" ~> 0.4
 github "loudnate/SwiftCharts" "loudnate/naterade"
 github "mddub/dexcom-share-client-swift" ~> 0.1
-github "ps2/rileylink_ios" "dev"
+github "ps2/rileylink_ios" "assert-pump-model"
 github "mpurland/Amplitude-iOS" "framework"

Cartfile.resolved

@@ -3,5 +3,5 @@ github "loudnate/Crypto" "e0ef5b498f2c373d676135dabf5d1803b8558509"
 github "loudnate/LoopKit" "v0.3.2"
 github "loudnate/SwiftCharts" "448b80f4025bbf592a4d8ca9d079e9684bc0b64b"
 github "mddub/dexcom-share-client-swift" "v0.1.0"
-github "ps2/rileylink_ios" "4305a83f897c19bd343c6b4f6fcdaaba0985ea64"
+github "ps2/rileylink_ios" "cb8de2c84b9f2a16870600e3112d056c2a082d2c"
 github "loudnate/xDripG5" "0.4.1"

Loop/Managers/DeviceDataManager.swift

@@ -187,7 +187,51 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
         }
     }
 
+    /**
+     Ensures pump data is current by either waking and polling, or ensuring we're listening to sentry packets.
+     */
+    private func assertCurrentPumpData() {
+        guard let device = rileyLinkManager.firstConnectedDevice else {
+            return
+        }
+
+        // TODO: Allow RileyLinkManager to enable/disable idle listening
+        device.assertIdleListening()
+
+        // How long should we wait before we poll for new reservoir data?
+        let reservoirTolerance = sentryEnabled ? NSTimeInterval(minutes: 11) : NSTimeInterval(minutes: 1)
+
+        // If we don't yet have reservoir data, or it's old, poll for it.
+        if latestReservoirValue == nil || latestReservoirValue!.startDate.timeIntervalSinceNow <= -reservoirTolerance {
+            device.ops?.readRemainingInsulin { (result) in
+                switch result {
+                case .Success(let units):
+                    self.updateReservoirVolume(units, atDate: NSDate(), withTimeLeft: nil)
+                case .Failure:
+                    // Try to troubleshoot communications errors with the pump
+
+                    // How long should we wait before we re-tune the RileyLink?
+                    let tuneTolerance = NSTimeInterval(minutes: 14)
+
+                    if device.lastTuned?.timeIntervalSinceNow <= -tuneTolerance {
+                        device.tunePumpWithResultHandler { (result) in
+                            switch result {
+                            case .Success(let scanResult):
+                                self.logger?.addError("Device auto-tuned to \(scanResult.bestFrequency) MHz", fromSource: "RileyLink")
+                            case .Failure(let error):
+                                self.logger?.addError("Device auto-tune failed with error: \(error)", fromSource: "RileyLink")
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     // MARK: - G5 Transmitter
+    /**
+     The G5 transmitter is a reliable heartbeat by which we can assert the loop state.
+     */
 
     // MARK: TransmitterDelegate
 
@@ -198,7 +242,7 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
             ], toCollection: "g5"
         )
 
-        rileyLinkManager.firstConnectedDevice?.assertIdleListening()
+        assertCurrentPumpData()
     }
 
     func transmitter(transmitter: Transmitter, didReadGlucose glucose: GlucoseRxMessage) {
@@ -226,7 +270,7 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
             }
         }
 
-        rileyLinkManager.firstConnectedDevice?.assertIdleListening()
+        assertCurrentPumpData()
     }
 
     // MARK: G5 data
@@ -310,7 +354,7 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
             return pumpState?.pumpID
         }
         set {
-            guard newValue?.characters.count == 6 else {
+            guard newValue?.characters.count == 6 && newValue != pumpState?.pumpID else {
                 return
             }
 
@@ -321,8 +365,6 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
                     pumpState.timeZone = timeZone
                 }
 
-                pumpState.pumpModel = self.pumpState?.pumpModel
-
                 self.pumpState = pumpState
             } else {
                 self.pumpState = nil
@@ -371,6 +413,10 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
                 }
             }
         case "pumpModel"?:
+            if let sentrySupported = pumpState?.pumpModel?.larger where !sentrySupported {
+                sentryEnabled = false
+            }
+
             NSUserDefaults.standardUserDefaults().pumpModelNumber = pumpState?.pumpModel?.rawValue
         case "lastHistoryDump"?, "awakeUntil"?:
             break
@@ -472,6 +518,9 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
         }
     }
 
+    /// Whether the RileyLink should listen for sentry packets.
+    var sentryEnabled: Bool = true
+
     // MARK: - CarbKit
 
     let carbStore: CarbStore?
@@ -641,7 +690,11 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
             }
 
             if let pumpModelNumber = NSUserDefaults.standardUserDefaults().pumpModelNumber {
-                pumpState.pumpModel = PumpModel(rawValue: pumpModelNumber)
+                if let model = PumpModel(rawValue: pumpModelNumber) {
+                    pumpState.pumpModel = model
+
+                    sentryEnabled = model.larger
+                }
             }
 
             self.pumpState = pumpState

Loop/Managers/LoopDataManager.swift

@@ -56,19 +56,6 @@ class LoopDataManager {
                 dispatch_async(self.dataAccessQueue) {
                     self.glucoseMomentumEffect = nil
                     self.notify()
-
-                    // Try to troubleshoot communications errors with the pump
-                    if  let pumpStatusDate = self.deviceDataManager.latestReservoirValue?.startDate where pumpStatusDate.timeIntervalSinceNow < NSTimeInterval(minutes: -15),
-                        let device = self.deviceDataManager.rileyLinkManager.firstConnectedDevice where device.lastTuned?.timeIntervalSinceNow < NSTimeInterval(minutes: -15) {
-                        device.tunePumpWithResultHandler { (result) in
-                            switch result {
-                            case .Success(let scanResult):
-                                self.deviceDataManager.logger?.addError("Device auto-tuned to \(scanResult.bestFrequency) MHz", fromSource: "RileyLink")
-                            case .Failure(let error):
-                                self.deviceDataManager.logger?.addError("Device auto-tune failed with error: \(error)", fromSource: "RileyLink")
-                            }
-                        }
-                    }
                 }
             },
             center.addObserverForName(DeviceDataManager.PumpStatusUpdatedNotification, object: deviceDataManager, queue: nil) { (note) -> Void in

Loop/Views/ReservoirVolumeHUDView.swift

@@ -24,8 +24,6 @@ class ReservoirVolumeHUDView: HUDView {
         didSet {
             if let volume = reservoirVolume, units = numberFormatter.stringFromNumber(volume) {
                 caption.text = "\(units) U"
-            } else {
-                caption.text = nil
             }
         }
     }