Tidepool Merge

WatchApp Extension/Extensions/Comparable.swift → Common/Extensions/Comparable.swift

@@ -1,6 +1,6 @@
 //
 //  Comparable.swift
-//  WatchApp Extension
+//  Loop
 //
 //  Created by Michael Pangburn on 3/27/20.
 //  Copyright © 2020 LoopKit Authors. All rights reserved.

Common/Extensions/NSBundle.swift

@@ -60,5 +60,27 @@ extension Bundle {
         }
         return .days(localCacheDurationDays)
     }
+
+    var hostIdentifier: String {
+        var identifier = bundleIdentifier ?? "com.loopkit.Loop"
+        let components = identifier.components(separatedBy: ".")
+        // DIY Loop has bundle identifiers like com.UY653SP37Q.loopkit.Loop
+        if components[2] == "loopkit" && components[3] == "Loop" {
+            identifier = "com.loopkit.Loop"
+        }
+        return identifier
+    }
+
+    var hostVersion: String {
+        var semanticVersion = shortVersionString
+
+        while semanticVersion.split(separator: ".").count < 3 {
+            semanticVersion += ".0"
+        }
+
+        semanticVersion += "+\(Bundle.main.version)"
+
+        return semanticVersion
+    }
 }
 

Common/Extensions/SampleValue.swift

@@ -7,7 +7,7 @@
 
 import HealthKit
 import LoopKit
-
+import LoopAlgorithm
 
 extension Collection where Element == SampleValue {
     /// O(n)

Common/FeatureFlags.swift

@@ -39,7 +39,7 @@ struct FeatureFlagConfiguration: Decodable {
     let profileExpirationSettingsViewEnabled: Bool
     let missedMealNotifications: Bool
     let allowAlgorithmExperiments: Bool
-
+    let isInvestigationalDevice: Bool
 
     fileprivate init() {
         // Swift compiler config is inverse, since the default state is enabled.
@@ -232,6 +232,12 @@ struct FeatureFlagConfiguration: Decodable {
         #else
         self.allowAlgorithmExperiments = false
         #endif
+
+        #if INVESTIGATIONAL_DEVICE
+        self.isInvestigationalDevice = true
+        #else
+        self.isInvestigationalDevice = false
+        #endif
     }
 }
 
@@ -267,7 +273,8 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* profileExpirationSettingsViewEnabled: \(profileExpirationSettingsViewEnabled)",
             "* missedMealNotifications: \(missedMealNotifications)",
             "* allowAlgorithmExperiments: \(allowAlgorithmExperiments)",
-            "* allowExperimentalFeatures: \(allowExperimentalFeatures)"
+            "* allowExperimentalFeatures: \(allowExperimentalFeatures)",
+            "* isInvestigationalDevice: \(isInvestigationalDevice)"
         ].joined(separator: "\n")
     }
 }

Common/Models/LoopSettingsUserInfo.swift

@@ -6,10 +6,67 @@
 //
 
 import LoopCore
+import LoopKit
 
+struct LoopSettingsUserInfo: Equatable {
+    var loopSettings: LoopSettings
+    var scheduleOverride: TemporaryScheduleOverride?
+    var preMealOverride: TemporaryScheduleOverride?
+
+    public mutating func enablePreMealOverride(at date: Date = Date(), for duration: TimeInterval) {
+        preMealOverride = makePreMealOverride(beginningAt: date, for: duration)
+    }
+
+    private func makePreMealOverride(beginningAt date: Date = Date(), for duration: TimeInterval) -> TemporaryScheduleOverride? {
+        guard let preMealTargetRange = loopSettings.preMealTargetRange else {
+            return nil
+        }
+        return TemporaryScheduleOverride(
+            context: .preMeal,
+            settings: TemporaryScheduleOverrideSettings(targetRange: preMealTargetRange),
+            startDate: date,
+            duration: .finite(duration),
+            enactTrigger: .local,
+            syncIdentifier: UUID()
+        )
+    }
+
+    public mutating func clearOverride(matching context: TemporaryScheduleOverride.Context? = nil) {
+        if context == .preMeal {
+            preMealOverride = nil
+            return
+        }
+
+        guard let scheduleOverride = scheduleOverride else { return }
+
+        if let context = context {
+            if scheduleOverride.context == context {
+                self.scheduleOverride = nil
+            }
+        } else {
+            self.scheduleOverride = nil
+        }
+    }
+
+    public func nonPreMealOverrideEnabled(at date: Date = Date()) -> Bool {
+        return scheduleOverride?.isActive(at: date) == true
+    }
+
+    public mutating func legacyWorkoutOverride(beginningAt date: Date = Date(), for duration: TimeInterval) -> TemporaryScheduleOverride? {
+        guard let legacyWorkoutTargetRange = loopSettings.legacyWorkoutTargetRange else {
+            return nil
+        }
+
+        return TemporaryScheduleOverride(
+            context: .legacyWorkout,
+            settings: TemporaryScheduleOverrideSettings(targetRange: legacyWorkoutTargetRange),
+            startDate: date,
+            duration: duration.isInfinite ? .indefinite : .finite(duration),
+            enactTrigger: .local,
+            syncIdentifier: UUID()
+        )
+    }
 
-struct LoopSettingsUserInfo {
-    let settings: LoopSettings
 }
 
 
@@ -23,19 +80,36 @@ extension LoopSettingsUserInfo: RawRepresentable {
         guard rawValue["v"] as? Int == LoopSettingsUserInfo.version,
             rawValue["name"] as? String == LoopSettingsUserInfo.name,
             let settingsRaw = rawValue["s"] as? LoopSettings.RawValue,
-            let settings = LoopSettings(rawValue: settingsRaw)
+            let loopSettings = LoopSettings(rawValue: settingsRaw)
         else {
             return nil
         }
 
-        self.settings = settings
+        self.loopSettings = loopSettings
+
+        if let rawScheduleOverride = rawValue["o"] as? TemporaryScheduleOverride.RawValue {
+            self.scheduleOverride = TemporaryScheduleOverride(rawValue: rawScheduleOverride)
+        } else {
+            self.scheduleOverride = nil
+        }
+
+        if let rawPreMealOverride = rawValue["p"] as? TemporaryScheduleOverride.RawValue {
+            self.preMealOverride = TemporaryScheduleOverride(rawValue: rawPreMealOverride)
+        } else {
+            self.preMealOverride = nil
+        }
     }
 
     var rawValue: RawValue {
-        return [
+        var raw: RawValue = [
             "v": LoopSettingsUserInfo.version,
             "name": LoopSettingsUserInfo.name,
-            "s": settings.rawValue
+            "s": loopSettings.rawValue
         ]
+
+        raw["o"] = scheduleOverride?.rawValue
+        raw["p"] = preMealOverride?.rawValue
+
+        return raw
     }
 }

Common/Models/PumpManager.swift

@@ -12,13 +12,13 @@ import MockKit
 import MockKitUI
 
 let staticPumpManagersByIdentifier: [String: PumpManagerUI.Type] = [
-    MockPumpManager.pluginIdentifier : MockPumpManager.self
+    MockPumpManager.managerIdentifier : MockPumpManager.self
 ]
 
 var availableStaticPumpManagers: [PumpManagerDescriptor] {
     if FeatureFlags.allowSimulators {
         return [
-            PumpManagerDescriptor(identifier: MockPumpManager.pluginIdentifier, localizedTitle: MockPumpManager.localizedTitle)
+            PumpManagerDescriptor(identifier: MockPumpManager.managerIdentifier, localizedTitle: MockPumpManager.localizedTitle)
         ]
     } else {
         return []

Common/Models/StatusExtensionContext.swift

@@ -11,6 +11,7 @@ import Foundation
 import HealthKit
 import LoopKit
 import LoopKitUI
+import LoopAlgorithm
 
 
 struct NetBasalContext {
@@ -295,6 +296,8 @@ struct StatusExtensionContext: RawRepresentable {
 
     var predictedGlucose: PredictedGlucoseContext?
     var lastLoopCompleted: Date?
+    var mostRecentGlucoseDataDate: Date?
+    var mostRecentPumpDataDate: Date?
     var createdAt: Date?
     var isClosedLoop: Bool?
     var preMealPresetAllowed: Bool?
@@ -327,6 +330,8 @@ struct StatusExtensionContext: RawRepresentable {
         }
 
         lastLoopCompleted = rawValue["lastLoopCompleted"] as? Date
+        mostRecentGlucoseDataDate = rawValue["mostRecentGlucoseDataDate"] as? Date
+        mostRecentPumpDataDate = rawValue["mostRecentPumpDataDate"] as? Date
         createdAt = rawValue["createdAt"] as? Date
         isClosedLoop = rawValue["isClosedLoop"] as? Bool
         preMealPresetAllowed = rawValue["preMealPresetAllowed"] as? Bool
@@ -368,6 +373,8 @@ struct StatusExtensionContext: RawRepresentable {
 
         raw["predictedGlucose"] = predictedGlucose?.rawValue
         raw["lastLoopCompleted"] = lastLoopCompleted
+        raw["mostRecentGlucoseDataDate"] = mostRecentGlucoseDataDate
+        raw["mostRecentPumpDataDate"] = mostRecentPumpDataDate
         raw["createdAt"] = createdAt
         raw["isClosedLoop"] = isClosedLoop
         raw["preMealPresetAllowed"] = preMealPresetAllowed

Common/Models/WatchContext.swift

@@ -9,6 +9,7 @@
 import Foundation
 import HealthKit
 import LoopKit
+import LoopAlgorithm
 
 
 final class WatchContext: RawRepresentable {

Common/Models/WatchHistoricalGlucose.swift

@@ -9,6 +9,7 @@
 import Foundation
 import HealthKit
 import LoopKit
+import LoopAlgorithm
 
 struct WatchHistoricalGlucose {
     let samples: [StoredGlucoseSample]

Common/Models/WatchPredictedGlucose.swift

@@ -9,6 +9,7 @@
 import Foundation
 import LoopKit
 import HealthKit
+import LoopAlgorithm
 
 
 struct WatchPredictedGlucose: Equatable {
@@ -29,7 +30,7 @@ extension WatchPredictedGlucose: RawRepresentable {
     var rawValue: RawValue {
 
         return [
-            "v": values.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) },
+            "v": values.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter).clamped(to: Double(Int16.min)...Double(Int16.max))) },
             "d": values[0].startDate,
             "i": values[1].startDate.timeIntervalSince(values[0].startDate)
         ]

Learn/Managers/DataManager.swift

@@ -47,7 +47,6 @@ final class DataManager {
             healthStore: healthStore,
             cacheStore: cacheStore,
             observationEnabled: false,
-            insulinModelProvider: PresetInsulinModelProvider(defaultRapidActingModel: defaultRapidActingModel),
             longestEffectDuration: ExponentialInsulinModelPreset.rapidActingAdult.effectDuration,
             basalProfile: basalRateSchedule,
             insulinSensitivitySchedule: insulinSensitivitySchedule,