Updates for CarbStore api changes, and change default absorption times. (LoopKit#129)

Author: ps2

Loop/Managers/LoopDataManager.swift

@@ -68,6 +68,11 @@ final class LoopDataManager {
         self.lockedBasalDeliveryState = Locked(basalDeliveryState)
         self.settings = settings
         self.overrideHistory = overrideHistory
+        
+        let absorptionTimes = LoopSettings.defaultCarbAbsorptionTimes
+        let cacheDuration = absorptionTimes.slow * 2
+        
+        self.overrideHistory.relevantTimeWindow = cacheDuration
 
         let healthStore = HKHealthStore()
 
@@ -78,7 +83,8 @@ final class LoopDataManager {
             observeHealthKitForCurrentAppOnly: FeatureFlags.observeHealthKitForCurrentAppOnly,
             cacheStore: cacheStore,
             cacheLength: localCacheDuration,
-            defaultAbsorptionTimes: LoopSettings.defaultCarbAbsorptionTimes,
+            defaultAbsorptionTimes: absorptionTimes,
+            observationInterval: cacheDuration,
             carbRatioSchedule: carbRatioSchedule,
             insulinSensitivitySchedule: insulinSensitivitySchedule,
             overrideHistory: overrideHistory,

LoopCore/LoopSettings.swift

@@ -13,7 +13,7 @@ public struct LoopSettings: Equatable {
 
     public let dynamicCarbAbsorptionEnabled = true
 
-    public static let defaultCarbAbsorptionTimes: CarbStore.DefaultAbsorptionTimes = (fast: .hours(2), medium: .hours(3), slow: .hours(4))
+    public static let defaultCarbAbsorptionTimes: CarbStore.DefaultAbsorptionTimes = (fast: .minutes(30), medium: .hours(3), slow: .hours(5))
 
     public var glucoseTargetRangeSchedule: GlucoseRangeSchedule?
 

WatchApp Extension/Managers/LoopDataManager.swift

@@ -53,12 +53,17 @@ class LoopDataManager {
 
         let healthStore = HKHealthStore()
         let cacheStore = PersistenceController.controllerInLocalDirectory()
+        
+        let absorptionTimes = LoopSettings.defaultCarbAbsorptionTimes
+        let cacheDuration = absorptionTimes.slow * 2
 
         carbStore = CarbStore(
             healthStore: healthStore,
             observeHealthKitForCurrentAppOnly: FeatureFlags.observeHealthKitForCurrentAppOnly,
             cacheStore: cacheStore,
-            defaultAbsorptionTimes: LoopSettings.defaultCarbAbsorptionTimes,
+            cacheLength: cacheDuration,
+            defaultAbsorptionTimes: absorptionTimes,
+            observationInterval: cacheDuration,
             syncVersion: 0
         )
         glucoseStore = GlucoseStore(