Denote stale glucose, and other watch updates

ps2 · ps2 · commit cf770815daad · 2020-01-17T18:04:25.000-06:00
diff --git a/Common/Models/WatchContext.swift b/Common/Models/WatchContext.swift
@@ -21,6 +21,7 @@ final class WatchContext: RawRepresentable {
     var glucose: HKQuantity?
     var glucoseTrendRawValue: Int?
     var glucoseDate: Date?
+    var glucoseSyncIdentifier: String?
 
     var predictedGlucose: WatchPredictedGlucose?
     var eventualGlucose: HKQuantity? {
@@ -57,6 +58,7 @@ final class WatchContext: RawRepresentable {
 
         glucoseTrendRawValue = rawValue["gt"] as? Int
         glucoseDate = rawValue["gd"] as? Date
+        glucoseSyncIdentifier = rawValue["gs"] as? String
         iob = rawValue["iob"] as? Double
         reservoir = rawValue["r"] as? Double
         reservoirPercentage = rawValue["rp"] as? Double
@@ -94,6 +96,7 @@ final class WatchContext: RawRepresentable {
 
         raw["gt"] = glucoseTrendRawValue
         raw["gd"] = glucoseDate
+        raw["gs"] = glucoseSyncIdentifier
         raw["iob"] = iob
         raw["ld"] = loopLastRunDate
         raw["r"] = reservoir
@@ -116,3 +119,12 @@ extension WatchContext {
         }
     }
 }
+
+extension WatchContext {
+    var newGlucoseSample: NewGlucoseSample? {
+        if let quantity = glucose, let date = glucoseDate, let syncIdentifier = glucoseSyncIdentifier {
+            return NewGlucoseSample(date: date, quantity: quantity, isDisplayOnly: false, syncIdentifier: syncIdentifier, syncVersion: 0)
+        }
+        return nil
+    }
+}
diff --git a/Loop Status Extension/StatusViewController.swift b/Loop Status Extension/StatusViewController.swift
@@ -256,11 +256,12 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                 return
             }
 
-            if let lastGlucose = glucose.last {
+            if let lastGlucose = glucose.last, let recencyInterval = defaults.loopSettings?.recencyInterval {
                 self.hudView.glucoseHUD.setGlucoseQuantity(
                     lastGlucose.quantity.doubleValue(for: unit),
                     at: lastGlucose.startDate,
                     unit: unit,
+                    staleGlucoseAge: recencyInterval,
                     sensor: context.sensor
                 )
             }
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
@@ -364,6 +364,8 @@
 		C17824A51E1AD4D100D9D25C /* BolusRecommendation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */; };
 		C17824A61E1AF91F00D9D25C /* BolusRecommendation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17824A41E1AD4D100D9D25C /* BolusRecommendation.swift */; };
 		C1814B86225E507C008D2D8E /* Sequence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1814B85225E507C008D2D8E /* Sequence.swift */; };
+		C19E96DF23D275F8003F79B0 /* LoopCompletionFreshness.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */; };
+		C19E96E023D275FA003F79B0 /* LoopCompletionFreshness.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */; };
 		C1A3EED2235233E1007672E3 /* DerivedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1A3EED1235233E1007672E3 /* DerivedAssets.xcassets */; };
 		C1A3EED423523551007672E3 /* DerivedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1A3EED323523551007672E3 /* DerivedAssets.xcassets */; };
 		C1A3EED523535FFF007672E3 /* DefaultAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 894F71E11FFEC4D8007D365C /* DefaultAssets.xcassets */; };
@@ -1015,6 +1017,7 @@
 		C18A491322FCC22900FDA733 /* make_scenario.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = make_scenario.py; sourceTree = "<group>"; };
 		C18A491422FCC22900FDA733 /* build-derived-watch-assets.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "build-derived-watch-assets.sh"; sourceTree = "<group>"; };
 		C18A491522FCC22900FDA733 /* copy-plugins.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "copy-plugins.sh"; sourceTree = "<group>"; };
+		C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopCompletionFreshness.swift; sourceTree = "<group>"; };
 		C1A3EED1235233E1007672E3 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = "<group>"; };
 		C1A3EED323523551007672E3 /* DerivedAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DerivedAssets.xcassets; sourceTree = "<group>"; };
 		C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_dropping_then_rising.json; sourceTree = "<group>"; };
@@ -1427,6 +1430,7 @@
 				43C05CB721EBEA54006FB252 /* HKUnit.swift */,
 				434FF1E91CF26C29000DB779 /* IdentifiableClass.swift */,
 				430B298C2041F56500BA9F93 /* LoopSettings.swift */,
+				C19E96DD23D2733F003F79B0 /* LoopCompletionFreshness.swift */,
 				430B29892041F54A00BA9F93 /* NSUserDefaults.swift */,
 				431E73471FF95A900069B5F7 /* PersistenceController.swift */,
 				43D848AF1E7DCBE100DADCBC /* Result.swift */,
@@ -2675,6 +2679,7 @@
 			files = (
 				43C05CB821EBEA54006FB252 /* HKUnit.swift in Sources */,
 				4345E3F421F036FC009E00E5 /* Result.swift in Sources */,
+				C19E96E023D275FA003F79B0 /* LoopCompletionFreshness.swift in Sources */,
 				43D9002021EB209400AF44BF /* NSTimeInterval.swift in Sources */,
 				43C05CA921EB2B26006FB252 /* PersistenceController.swift in Sources */,
 				431EA87221EB29150076EC1A /* InsulinModelSettings.swift in Sources */,
@@ -2726,6 +2731,7 @@
 			files = (
 				43C05CB921EBEA54006FB252 /* HKUnit.swift in Sources */,
 				4345E3F521F036FC009E00E5 /* Result.swift in Sources */,
+				C19E96DF23D275F8003F79B0 /* LoopCompletionFreshness.swift in Sources */,
 				43D9FFFB21EAF3D300AF44BF /* NSTimeInterval.swift in Sources */,
 				43C05CA821EB2B26006FB252 /* PersistenceController.swift in Sources */,
 				431EA87321EB29160076EC1A /* InsulinModelSettings.swift in Sources */,
diff --git a/Loop/Managers/WatchDataManager.swift b/Loop/Managers/WatchDataManager.swift
@@ -160,6 +160,18 @@ final class WatchDataManager: NSObject {
             if let trend = self.deviceManager.cgmManager?.sensorState?.trendType {
                 context.glucoseTrendRawValue = trend.rawValue
             }
+            
+            if let glucose = glucose {
+                updateGroup.enter()
+                manager.glucoseStore.getCachedGlucoseSamples(start: glucose.startDate) { (samples) in
+                    if let sample = samples.last {
+                        context.glucose = sample.quantity
+                        context.glucoseDate = sample.startDate
+                        context.glucoseSyncIdentifier = sample.syncIdentifier
+                    }
+                    updateGroup.leave()
+                }
+            }
 
             updateGroup.enter()
             manager.doseStore.insulinOnBoard(at: Date()) { (result) in
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
@@ -487,6 +487,7 @@ final class StatusTableViewController: ChartsTableViewController {
                     hudView.glucoseHUD.setGlucoseQuantity(glucose.quantity.doubleValue(for: unit),
                         at: glucose.startDate,
                         unit: unit,
+                        staleGlucoseAge: self.deviceManager.loopManager.settings.recencyInterval,
                         sensor: self.deviceManager.sensorState
                     )
                 }
diff --git a/LoopCore/LoopSettings.swift b/LoopCore/LoopSettings.swift
@@ -38,6 +38,11 @@ public struct LoopSettings: Equatable {
 
     /// The amount of time since a given date that data should be considered valid
     public let recencyInterval = TimeInterval(minutes: 15)
+    
+    /// Loop completion aging category limits
+    public let completionFreshLimit = TimeInterval(minutes: 6)
+    public let completionAgingLimit = TimeInterval(minutes: 16)
+    public let completionStaleLimit = TimeInterval(hours: 12)
 
     public let batteryReplacementDetectionThreshold = 0.5
 
diff --git a/LoopUI/Views/GlucoseHUDView.swift b/LoopUI/Views/GlucoseHUDView.swift
@@ -91,27 +91,27 @@ public final class GlucoseHUDView: BaseHUDView {
         }
     }
 
-    public func setGlucoseQuantity(_ glucoseQuantity: Double, at glucoseStartDate: Date, unit: HKUnit, sensor: SensorDisplayable?) {
+    public func setGlucoseQuantity(_ glucoseQuantity: Double, at glucoseStartDate: Date, unit: HKUnit, staleGlucoseAge: TimeInterval, sensor: SensorDisplayable?) {
         var accessibilityStrings = [String]()
 
         let time = timeFormatter.string(from: glucoseStartDate)
         caption?.text = time
         
-        let sensorDataCurrent = glucoseStartDate.timeIntervalSinceNow > TimeInterval(minutes: -15)
+        let glucoseValueCurrent = glucoseStartDate.timeIntervalSinceNow > -staleGlucoseAge
 
         let numberFormatter = NumberFormatter.glucoseFormatter(for: unit)
         if let valueString = numberFormatter.string(from: glucoseQuantity) {
-            if sensorDataCurrent {
+            if glucoseValueCurrent {
                 glucoseLabel.text = valueString
             } else {
-                glucoseLabel.text = "-"
+                glucoseLabel.text = "---"
             }
             accessibilityStrings.append(String(format: LocalizedString("%1$@ at %2$@", comment: "Accessbility format value describing glucose: (1: glucose number)(2: glucose time)"), valueString, time))
         }
 
         var unitStrings = [unit.localizedShortUnitString]
 
-        if let trend = sensor?.trendType, sensorDataCurrent {
+        if let trend = sensor?.trendType, glucoseValueCurrent {
             unitStrings.append(trend.symbol)
             accessibilityStrings.append(trend.localizedDescription)
         }
diff --git a/LoopUI/Views/LoopCompletionHUDView.swift b/LoopUI/Views/LoopCompletionHUDView.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 import LoopKitUI
+import LoopCore
 
 public final class LoopCompletionHUDView: BaseHUDView {
 
@@ -17,14 +18,7 @@ public final class LoopCompletionHUDView: BaseHUDView {
         return 1
     }
 
-    enum Freshness {
-        case fresh
-        case aging
-        case stale
-        case unknown
-    }
-
-    private(set) var freshness = Freshness.unknown {
+    private(set) var freshness = LoopCompletionFreshness.unknown {
         didSet {
             updateTintColor()
         }
@@ -128,17 +122,8 @@ public final class LoopCompletionHUDView: BaseHUDView {
     @objc private func updateDisplay(_: Timer?) {
         if let date = lastLoopCompleted {
             let ago = abs(min(0, date.timeIntervalSinceNow))
-
-            switch ago {
-            case let t where t <= .minutes(6):
-                freshness = .fresh
-            case let t where t <= .minutes(16):
-                freshness = .aging
-            case let t where t <= .hours(12):
-                freshness = .stale
-            default:
-                freshness = .unknown
-            }
+            
+            freshness = LoopCompletionFreshness(age: ago)
 
             if let timeString = formatter.string(from: ago) {
                 switch traitCollection.preferredContentSizeCategory {
diff --git a/WatchApp Extension/ComplicationController.swift b/WatchApp Extension/ComplicationController.swift
@@ -76,19 +76,24 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
     func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: (@escaping (CLKComplicationTimelineEntry?) -> Void)) {
         updateChartManagerIfNeeded(completion: {
             let entry: CLKComplicationTimelineEntry?
-
-            if  let context = ExtensionDelegate.shared().loopManager.activeContext,
-                let glucoseDate = context.glucoseDate,
-                glucoseDate.timeIntervalSinceNow.minutes >= -15,
-                let template = CLKComplicationTemplate.templateForFamily(complication.family, from: context, chartGenerator: self.makeChart)
+            
+            let settings = ExtensionDelegate.shared().loopManager.settings
+            let timelineDate = Date()
+            
+            if let context = ExtensionDelegate.shared().loopManager.activeContext,
+                let template = CLKComplicationTemplate.templateForFamily(complication.family,
+                                                                         from: context,
+                                                                         at: timelineDate,
+                                                                         recencyInterval: settings.recencyInterval,
+                                                                         chartGenerator: self.makeChart)
             {
                 switch complication.family {
                 case .graphicRectangular:
                     break
                 default:
                     template.tintColor = .tintColor
                 }
-                entry = CLKComplicationTimelineEntry(date: glucoseDate, complicationTemplate: template)
+                entry = CLKComplicationTimelineEntry(date: timelineDate, complicationTemplate: template)
             } else {
                 entry = nil
             }
@@ -97,22 +102,31 @@ final class ComplicationController: NSObject, CLKComplicationDataSource {
         })
     }
     
-    func getTimelineEntries(for complication: CLKComplication, before date: Date, limit: Int, withHandler handler: (@escaping ([CLKComplicationTimelineEntry]?) -> Void)) {
-        // Call the handler with the timeline entries prior to the given date
-        handler(nil)
-    }
-    
     func getTimelineEntries(for complication: CLKComplication, after date: Date, limit: Int, withHandler handler: (@escaping ([CLKComplicationTimelineEntry]?) -> Void)) {
         updateChartManagerIfNeeded {
             let entries: [CLKComplicationTimelineEntry]?
-
-            if  let context = ExtensionDelegate.shared().loopManager.activeContext,
-                let glucoseDate = context.glucoseDate,
-                glucoseDate.timeIntervalSince(date) > 0,
-                let template = CLKComplicationTemplate.templateForFamily(complication.family, from: context, chartGenerator: self.makeChart)
+            
+            let settings = ExtensionDelegate.shared().loopManager.settings
+            
+            guard let context = ExtensionDelegate.shared().loopManager.activeContext,
+                let glucoseDate = context.glucoseDate else
+            {
+                handler(nil)
+                return
+            }
+            
+            // Stale date is just a second after glucose expires
+            let staleDate = glucoseDate + settings.recencyInterval + 1
+
+            if  staleDate > date,
+                let template = CLKComplicationTemplate.templateForFamily(complication.family,
+                                                                         from: context,
+                                                                         at: staleDate,
+                                                                         recencyInterval: settings.recencyInterval,
+                                                                         chartGenerator: self.makeChart)
             {
                 template.tintColor = UIColor.tintColor
-                entries = [CLKComplicationTimelineEntry(date: glucoseDate, complicationTemplate: template)]
+                entries = [CLKComplicationTimelineEntry(date: staleDate, complicationTemplate: template)]
             } else {
                 entries = nil
             }
diff --git a/WatchApp Extension/Controllers/HUDInterfaceController.swift b/WatchApp Extension/Controllers/HUDInterfaceController.swift
@@ -29,6 +29,8 @@ class HUDInterfaceController: WKInterfaceController {
                 }
             }
         }
+        
+        loopManager.requestGlucoseBackfillIfNecessary()
     }
 
     override func didDeactivate() {
@@ -48,9 +50,10 @@ class HUDInterfaceController: WKInterfaceController {
             return
         }
 
-        glucoseLabel.setHidden(true)
+        glucoseLabel.setText("---")
+        glucoseLabel.setHidden(false)
         eventualGlucoseLabel.setHidden(true)
-        if let glucose = activeContext.glucose, let unit = activeContext.preferredGlucoseUnit {
+        if let glucose = activeContext.glucose, let glucoseDate = activeContext.glucoseDate, let unit = activeContext.preferredGlucoseUnit, glucoseDate.timeIntervalSinceNow > -loopManager.settings.recencyInterval {
             let formatter = NumberFormatter.glucoseFormatter(for: unit)
 
             if let glucoseValue = formatter.string(from: glucose.doubleValue(for: unit)) {
diff --git a/WatchApp Extension/Extensions/CLKComplicationTemplate.swift b/WatchApp Extension/Extensions/CLKComplicationTemplate.swift
diff --git a/WatchApp Extension/Extensions/UIColor.swift b/WatchApp Extension/Extensions/UIColor.swift
diff --git a/WatchApp Extension/Managers/LoopDataManager.swift b/WatchApp Extension/Managers/LoopDataManager.swift

Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,12 @@ class StatusViewController: UIViewController, NCWidgetProviding {`
`256`	`256`	`return`
`257`	`257`	`}`
`258`	`258`
`259`		`- if let lastGlucose = glucose.last {`
	`259`	`+ if let lastGlucose = glucose.last, let recencyInterval = defaults.loopSettings?.recencyInterval {`
`260`	`260`	`self.hudView.glucoseHUD.setGlucoseQuantity(`
`261`	`261`	`lastGlucose.quantity.doubleValue(for: unit),`
`262`	`262`	`at: lastGlucose.startDate,`
`263`	`263`	`unit: unit,`
	`264`	`+ staleGlucoseAge: recencyInterval,`
`264`	`265`	`sensor: context.sensor`
`265`	`266`	`)`
`266`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -487,6 +487,7 @@ final class StatusTableViewController: ChartsTableViewController {`
`487`	`487`	`hudView.glucoseHUD.setGlucoseQuantity(glucose.quantity.doubleValue(for: unit),`
`488`	`488`	`at: glucose.startDate,`
`489`	`489`	`unit: unit,`
	`490`	`+ staleGlucoseAge: self.deviceManager.loopManager.settings.recencyInterval,`
`490`	`491`	`sensor: self.deviceManager.sensorState`
`491`	`492`	`)`
`492`	`493`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,27 +91,27 @@ public final class GlucoseHUDView: BaseHUDView {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- public func setGlucoseQuantity(_ glucoseQuantity: Double, at glucoseStartDate: Date, unit: HKUnit, sensor: SensorDisplayable?) {`
	`94`	`+ public func setGlucoseQuantity(_ glucoseQuantity: Double, at glucoseStartDate: Date, unit: HKUnit, staleGlucoseAge: TimeInterval, sensor: SensorDisplayable?) {`
`95`	`95`	`var accessibilityStrings = [String]()`
`96`	`96`
`97`	`97`	`let time = timeFormatter.string(from: glucoseStartDate)`
`98`	`98`	`caption?.text = time`
`99`	`99`
`100`		`- let sensorDataCurrent = glucoseStartDate.timeIntervalSinceNow > TimeInterval(minutes: -15)`
	`100`	`+ let glucoseValueCurrent = glucoseStartDate.timeIntervalSinceNow > -staleGlucoseAge`
`101`	`101`
`102`	`102`	`let numberFormatter = NumberFormatter.glucoseFormatter(for: unit)`
`103`	`103`	`if let valueString = numberFormatter.string(from: glucoseQuantity) {`
`104`		`- if sensorDataCurrent {`
	`104`	`+ if glucoseValueCurrent {`
`105`	`105`	`glucoseLabel.text = valueString`
`106`	`106`	`} else {`
`107`		`- glucoseLabel.text = "-"`
	`107`	`+ glucoseLabel.text = "---"`
`108`	`108`	`}`
`109`	`109`	`accessibilityStrings.append(String(format: LocalizedString("%1$@ at %2$@", comment: "Accessbility format value describing glucose: (1: glucose number)(2: glucose time)"), valueString, time))`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`var unitStrings = [unit.localizedShortUnitString]`
`113`	`113`
`114`		`- if let trend = sensor?.trendType, sensorDataCurrent {`
	`114`	`+ if let trend = sensor?.trendType, glucoseValueCurrent {`
`115`	`115`	`unitStrings.append(trend.symbol)`
`116`	`116`	`accessibilityStrings.append(trend.localizedDescription)`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ class HUDInterfaceController: WKInterfaceController {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ loopManager.requestGlucoseBackfillIfNecessary()`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`override func didDeactivate() {`
`@@ -48,9 +50,10 @@ class HUDInterfaceController: WKInterfaceController {`
`48`	`50`	`return`
`49`	`51`	`}`
`50`	`52`
`51`		`- glucoseLabel.setHidden(true)`
	`53`	`+ glucoseLabel.setText("---")`
	`54`	`+ glucoseLabel.setHidden(false)`
`52`	`55`	`eventualGlucoseLabel.setHidden(true)`
`53`		`- if let glucose = activeContext.glucose, let unit = activeContext.preferredGlucoseUnit {`
	`56`	`+ if let glucose = activeContext.glucose, let glucoseDate = activeContext.glucoseDate, let unit = activeContext.preferredGlucoseUnit, glucoseDate.timeIntervalSinceNow > -loopManager.settings.recencyInterval {`
`54`	`57`	`let formatter = NumberFormatter.glucoseFormatter(for: unit)`
`55`	`58`
`56`	`59`	`if let glucoseValue = formatter.string(from: glucose.doubleValue(for: unit)) {`