Tmecklem x22 enlite cgm (#378)

* Fetch cgm data from x22 pump

* Add fetch glucose flag

* Add SensorDisplayable wrapper for pump glucose history events

* Restructure glucose history handling

* Rename functions to Enlite to improve clarity

Group Enlite functions and data together

* Add pumpDataIsStale, move enlite fetch into timer tick

Rename user default key

* Keep stale glucose check to avoid fetching enlite pages too often

Loop.xcodeproj/project.pbxproj

@@ -180,6 +180,7 @@
 		4FF4D0F91E17268800846527 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */; };
 		4FF4D1001E18374700846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; };
 		4FF4D1011E18375000846527 /* WatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4D0FF1E18374700846527 /* WatchContext.swift */; };
+		540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */; };
 		C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
 		C12F21A71DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */; };
 		C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */; };
@@ -471,6 +472,7 @@
 		4F75288E1DFE1DC600C322D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4FC8C8001DEB93E400A1452E /* NSUserDefaults+StatusExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSUserDefaults+StatusExtension.swift"; sourceTree = "<group>"; };
 		4FF4D0FF1E18374700846527 /* WatchContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchContext.swift; sourceTree = "<group>"; };
+		540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnliteSensorDisplayable.swift; sourceTree = "<group>"; };
 		C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = "<group>"; };
 		C12F21A61DFA79CB00748193 /* recommend_tamp_basal_very_low_end_in_range.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_tamp_basal_very_low_end_in_range.json; sourceTree = "<group>"; };
 		C15713811DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MealBolusNightscoutTreatment.swift; sourceTree = "<group>"; };
@@ -595,6 +597,7 @@
 				438D42F81D7C88BC003244B0 /* PredictionInputEffect.swift */,
 				43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */,
 				4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
+				540DED961E14C75F002B2491 /* EnliteSensorDisplayable.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -1356,6 +1359,7 @@
 				4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */,
 				4F526D611DF8D9A900A04910 /* NetBasal.swift in Sources */,
 				4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */,
+				540DED971E14C75F002B2491 /* EnliteSensorDisplayable.swift in Sources */,
 				436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */,
 				43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */,
 				433EA4C21D9F39C900CD78FB /* PumpIDTableViewController.swift in Sources */,

Loop/Extensions/NSUserDefaults.swift

@@ -26,6 +26,7 @@ extension UserDefaults {
         case MaximumBasalRatePerHour = "com.loudnate.Naterade.MaximumBasalRatePerHour"
         case MaximumBolus = "com.loudnate.Naterade.MaximumBolus"
         case PreferredInsulinDataSource = "com.loudnate.Loop.PreferredInsulinDataSource"
+        case FetchEnliteDataEnabled = "com.loopkit.Loop.FetchEnliteDataEnabled"
         case PumpID = "com.loudnate.Naterade.PumpID"
         case PumpModelNumber = "com.loudnate.Naterade.PumpModelNumber"
         case PumpRegion = "com.loopkit.Loop.PumpRegion"
@@ -215,6 +216,15 @@ extension UserDefaults {
         }
     }
 
+    var fetchEnliteDataEnabled: Bool {
+        get {
+            return bool(forKey: Key.FetchEnliteDataEnabled.rawValue)
+        }
+        set {
+            set(newValue, forKey: Key.FetchEnliteDataEnabled.rawValue)
+        }
+    }
+
     var retrospectiveCorrectionEnabled: Bool {
         get {
             return bool(forKey: Key.RetrospectiveCorrectionEnabled.rawValue)

Loop/Managers/DeviceDataManager.swift

@@ -63,8 +63,17 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
         }
     }
 
+    var fetchEnliteDataEnabled: Bool {
+        get {
+            return UserDefaults.standard.fetchEnliteDataEnabled
+        }
+        set {
+            UserDefaults.standard.fetchEnliteDataEnabled = newValue
+        }
+    }
+
     var sensorInfo: SensorDisplayable? {
-        return latestGlucoseG5 ?? latestGlucoseG4 ?? latestGlucoseFromShare ?? latestPumpStatusFromMySentry
+        return latestGlucoseG5 ?? latestGlucoseG4 ?? latestGlucoseFromShare ?? latestPumpStatusFromMySentry ?? latestEnliteData
     }
 
     var latestPumpStatus: RileyLinkKit.PumpStatus?
@@ -135,6 +144,10 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
 
     @objc private func receivedRileyLinkTimerTickNotification(_ note: Notification) {
         backfillGlucoseFromShareIfNeeded() {
+            if UserDefaults.standard.fetchEnliteDataEnabled {
+                self.assertCurrentEnliteData()
+            }
+
             self.assertCurrentPumpData()
         }
     }
@@ -365,42 +378,43 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
         }
     }
 
+    private func pumpDataIsStale() -> Bool {
+        // How long should we wait before we poll for new pump data?
+        let pumpStatusAgeTolerance = rileyLinkManager.idleListeningEnabled ? TimeInterval(minutes: 11) : TimeInterval(minutes: 4)
+
+        return doseStore.lastReservoirValue == nil
+            || doseStore.lastReservoirValue!.startDate.timeIntervalSinceNow <= -pumpStatusAgeTolerance
+    }
+
     /**
      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 {
+        guard let device = rileyLinkManager.firstConnectedDevice, pumpDataIsStale() else {
             return
         }
 
         device.assertIdleListening()
 
-        // How long should we wait before we poll for new pump data?
-        let pumpStatusAgeTolerance = rileyLinkManager.idleListeningEnabled ? TimeInterval(minutes: 11) : TimeInterval(minutes: 4)
-
-        // If we don't yet have pump status, or it's old, poll for it.
-        if  doseStore.lastReservoirValue == nil ||
-            doseStore.lastReservoirValue!.startDate.timeIntervalSinceNow <= -pumpStatusAgeTolerance {
-            readPumpData { (result) in
-                let nsPumpStatus: NightscoutUploadKit.PumpStatus?
-                switch result {
-                case .success(let (status, date)):
-                    self.observeBatteryDuring {
-                        self.latestPumpStatus = status
-                    }
+        readPumpData { (result) in
+            let nsPumpStatus: NightscoutUploadKit.PumpStatus?
+            switch result {
+            case .success(let (status, date)):
+                self.observeBatteryDuring {
+                    self.latestPumpStatus = status
+                }
 
-                    self.updateReservoirVolume(status.reservoir, at: date, withTimeLeft: nil)
-                    let battery = BatteryStatus(voltage: status.batteryVolts, status: BatteryIndicator(batteryStatus: status.batteryStatus))
+                self.updateReservoirVolume(status.reservoir, at: date, withTimeLeft: nil)
+                let battery = BatteryStatus(voltage: status.batteryVolts, status: BatteryIndicator(batteryStatus: status.batteryStatus))
 
 
-                    nsPumpStatus = NightscoutUploadKit.PumpStatus(clock: date, pumpID: status.pumpID, iob: nil, battery: battery, suspended: status.suspended, bolusing: status.bolusing, reservoir: status.reservoir)
-                case .failure(let error):
-                    self.troubleshootPumpComms(using: device)
-                    self.nightscoutDataManager.uploadLoopStatus(loopError: error)
-                    nsPumpStatus = nil
-                }
-                self.nightscoutDataManager.uploadDeviceStatus(nsPumpStatus)
+                nsPumpStatus = NightscoutUploadKit.PumpStatus(clock: date, pumpID: status.pumpID, iob: nil, battery: battery, suspended: status.suspended, bolusing: status.bolusing, reservoir: status.reservoir)
+            case .failure(let error):
+                self.troubleshootPumpComms(using: device)
+                self.nightscoutDataManager.uploadLoopStatus(loopError: error)
+                nsPumpStatus = nil
             }
+            self.nightscoutDataManager.uploadDeviceStatus(nsPumpStatus)
         }
     }
 
@@ -484,6 +498,65 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
         }
     }
 
+    // MARK: - Enlite
+
+    fileprivate var latestEnliteData: EnliteSensorDisplayable?
+
+    private func updateEnliteSensorStatus(_ events: [TimestampedGlucoseEvent]) {
+        let sensorEvents = events.filter({ $0.glucoseEvent is RelativeTimestampedGlucoseEvent })
+
+        if let latestSensorEvent = sensorEvents.last?.glucoseEvent as? RelativeTimestampedGlucoseEvent {
+            self.latestEnliteData = EnliteSensorDisplayable(latestSensorEvent)
+        }
+    }
+
+    private func assertCurrentEnliteData() {
+        guard let device = rileyLinkManager.firstConnectedDevice, pumpDataIsStale() else {
+            return
+        }
+
+        device.assertIdleListening()
+
+        let fetchGlucoseSince = glucoseStore?.latestGlucose?.startDate.addingTimeInterval(TimeInterval(minutes: 1)) ?? Date(timeIntervalSinceNow: TimeInterval(hours: -24))
+
+        guard fetchGlucoseSince.timeIntervalSinceNow <= TimeInterval(minutes: -4.5) else {
+            return
+        }
+
+        device.ops?.getGlucoseHistoryEvents(since: fetchGlucoseSince, completion: { (result) in
+            switch result {
+            case .success(let glucoseEvents):
+
+                defer {
+                    _ = self.remoteDataManager.nightscoutUploader?.processGlucoseEvents(glucoseEvents, source: device.deviceURI)
+                }
+
+                self.updateEnliteSensorStatus(glucoseEvents)
+
+                let glucoseValues = glucoseEvents
+                    .filter({ $0.glucoseEvent is SensorValueGlucoseEvent && $0.date > fetchGlucoseSince })
+                    .map({ (e:TimestampedGlucoseEvent) -> (quantity: HKQuantity, date: Date, isDisplayOnly: Bool) in
+                        let glucoseEvent = e.glucoseEvent as! SensorValueGlucoseEvent
+                        let quantity = HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: Double(glucoseEvent.sgv))
+                        return (quantity: quantity, date: e.date, isDisplayOnly: false)
+                    })
+
+                self.glucoseStore?.addGlucoseValues(glucoseValues, device: nil, resultHandler:  { (success, _, error) in
+                    if let error = error {
+                        self.logger.addError(error, fromSource: "GlucoseStore")
+                    }
+
+                    if success {
+                        NotificationCenter.default.post(name: .GlucoseUpdated, object: self)
+                    }
+                })
+
+            case .failure(let error):
+                self.logger.addError(error, fromSource: "PumpOps")
+            }
+        })
+    }
+
     // MARK: - G5 Transmitter
     /// The G5 transmitter is a reliable heartbeat by which we can assert the loop state.
 

Loop/Models/EnliteSensorDisplayable.swift

@@ -0,0 +1,21 @@
+//
+//  EnliteSensorDisplayable.swift
+//  Loop
+//
+//  Created by Timothy Mecklem on 12/28/16.
+//  Copyright © 2016 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+import LoopUI
+import MinimedKit
+
+struct EnliteSensorDisplayable: SensorDisplayable {
+    public let isStateValid: Bool
+    public let trendType: LoopUI.GlucoseTrend? = nil
+    public let isLocal = true
+
+    public init?(_ e: RelativeTimestampedGlucoseEvent) {
+        isStateValid = e is SensorValueGlucoseEvent
+    }
+}

Loop/View Controllers/SettingsTableViewController.swift

@@ -103,11 +103,12 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
     }
 
     fileprivate enum CGMRow: Int {
-        case receiverEnabled = 0
+        case fetchEnlite = 0
+        case receiverEnabled
         case transmitterEnabled
         case transmitterID  // optional, only displayed if transmitterEnabled
 
-	static let count = 3
+        static let count = 4
     }
 
     fileprivate enum ConfigurationRow: Int {
@@ -210,6 +211,17 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
             }
             cell = configCell
         case .cgm:
+            if case .fetchEnlite = CGMRow(rawValue: indexPath.row)! {
+                let switchCell = tableView.dequeueReusableCell(withIdentifier: SwitchTableViewCell.className, for: indexPath) as! SwitchTableViewCell
+
+                switchCell.`switch`?.isOn = dataManager.fetchEnliteDataEnabled
+                switchCell.titleLabel.text = NSLocalizedString("Fetch Enlite Data", comment: "The title text for the fetch enlite data enabled switch cell")
+
+                switchCell.`switch`?.addTarget(self, action: #selector(fetchEnliteEnabledChanged(_:)), for: .valueChanged)
+
+                return switchCell
+            }
+
             if case .receiverEnabled = CGMRow(rawValue: indexPath.row)! {
                 let switchCell = tableView.dequeueReusableCell(withIdentifier: SwitchTableViewCell.className, for: indexPath) as! SwitchTableViewCell
 
@@ -235,6 +247,8 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
             let configCell = tableView.dequeueReusableCell(withIdentifier: ConfigCellIdentifier, for: indexPath)
             switch CGMRow(rawValue: indexPath.row)! {
+            case .fetchEnlite:
+                break
             case .transmitterEnabled:
                 break
             case .transmitterID:
@@ -418,6 +432,8 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         case .cgm:
             let row = CGMRow(rawValue: indexPath.row)!
             switch row {
+            case .fetchEnlite:
+                break
             case .transmitterEnabled:
                 break
             case .transmitterID:
@@ -660,6 +676,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         if dataManager.transmitterEnabled == false {
             dataManager.transmitterEnabled = true
             disableReceiver()
+            disableEnlite()
             tableView.insertRows(at: [IndexPath(row: CGMRow.transmitterID.rawValue, section:Section.cgm.rawValue)], with: .top)
         }
     }
@@ -678,6 +695,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
 
         if sender.isOn {
             disableTransmitter()
+            disableEnlite()
         }
     }
 
@@ -687,6 +705,21 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
         switchCell.`switch`?.setOn(false, animated: true)
     }
 
+    func fetchEnliteEnabledChanged(_ sender: UISwitch) {
+        dataManager.fetchEnliteDataEnabled = sender.isOn
+
+        if sender.isOn {
+            disableTransmitter()
+            disableReceiver();
+        }
+    }
+
+    private func disableEnlite() {
+        dataManager.fetchEnliteDataEnabled = false
+        let switchCell = tableView.cellForRow(at: IndexPath(row: CGMRow.fetchEnlite.rawValue, section: Section.cgm.rawValue)) as! SwitchTableViewCell
+        switchCell.`switch`?.setOn(false, animated: true)
+    }
+
     // MARK: - DailyValueScheduleTableViewControllerDelegate
 
     func dailyValueScheduleTableViewControllerWillFinishUpdating(_ controller: DailyValueScheduleTableViewController) {

LoopUI/Models/SensorDisplayable.swift

@@ -19,6 +19,6 @@ public protocol SensorDisplayable {
     /// Enumerates the trend of the sensor values
     var trendType: GlucoseTrend? { get }
 
-    /// Returns wheter the data is from a locally-connected device
+    /// Returns whether the data is from a locally-connected device
     var isLocal: Bool { get }
 }