Merge pull request #995 from LoopKit/merge-tidepool-dev

Merge tidepool dev

Author: ps2

Cartfile.resolved

@@ -1,8 +1,8 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "4194dbdabd4a2df390f41ada25bb99941fd165ca"
-github "LoopKit/G4ShareSpy" "4e4ea119d34d65cee35ccab9df0259e1dee52460"
-github "LoopKit/LoopKit" "346f5e85940fb56211035ae2e9f522512f17d0c0"
-github "LoopKit/dexcom-share-client-swift" "2179b253800dc527391ac582bdc9a0a7622e17c1"
+github "LoopKit/CGMBLEKit" "c4d73c4646591e43362f012b6a1b229a76d082ba"
+github "LoopKit/G4ShareSpy" "f6ae0cf1753131135f26046ddf07e096da884b84"
+github "LoopKit/LoopKit" "4eca69b9f2e3f1fc74e5b62484db00777c002cb7"
+github "LoopKit/dexcom-share-client-swift" "cdbb1cd19cf54b37add6d6c25300445a6abe24da"
 github "i-schuetz/SwiftCharts" "0.6.5"
 github "maxkonovalov/MKRingProgressView" "2.2.2"
 github "ps2/rileylink_ios" "f616a671bac254b25c5e298f01824200944c2267"

Common/Extensions/GlucoseRangeSchedule.swift

@@ -10,38 +10,8 @@ import HealthKit
 
 
 extension GlucoseRangeSchedule {
-    func overrideEnabledForContext(_ context: Override.Context) -> Bool? {
-        guard let override = override, override.context == context else {
-            guard let value = overrideRanges[context], !value.isZero else {
-                // Unavailable to set
-                return nil
-            }
-
-            return false
-        }
-
-        return override.isActive()
-    }
-
-    var activeOverride: GlucoseRangeSchedule.Override? {
-        guard let override = override, override.isActive() else {
-            return nil
-        }
-
-        return override
-    }
-
-    var activeOverrideContext: GlucoseRangeSchedule.Override.Context? {
-        return activeOverride?.context
-    }
-
-    var configuredOverrideContexts: [GlucoseRangeSchedule.Override.Context] {
-        var contexts: [GlucoseRangeSchedule.Override.Context] = []
-        for (context, range) in overrideRanges where !range.isZero {
-            contexts.append(context)
-        }
-
-        return contexts
+    func minQuantity(at date: Date) -> HKQuantity {
+        return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
     }
 }
 

Common/FeatureFlags.swift

@@ -0,0 +1,25 @@
+//
+//  FeatureFlags.swift
+//  Loop
+//
+//  Created by Michael Pangburn on 5/19/19.
+//  Copyright © 2019 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+
+let FeatureFlags = FeatureFlagConfiguration()
+
+struct FeatureFlagConfiguration: Decodable {
+    let sensitivityOverridesEnabled: Bool
+
+    fileprivate init() {
+        // Swift compiler config is inverse, since the default state is enabled.
+        #if FEATURE_OVERRIDES_DISABLED
+        self.sensitivityOverridesEnabled = false
+        #else
+        self.sensitivityOverridesEnabled = true
+        #endif
+    }
+}

Documentation/Testing/Images/mock_managers.png

@@ -0,0 +1,67 @@
+# Guide: Testing Scenarios
+
+## Purpose
+
+This document describes how to load data-based scenarios, including glucose values, dose history, and carb entries, into Loop on demand.
+
+## File Format
+
+A scenario consists of a single JSON file containing glucose, basal, bolus, and carb entry histories. Each history corresponds to a property of the scenario JSON object—a list of individual entries. Each entry has one or more properties describing its value (e.g. `unitsPerHourValue` and `duration`) and a _relative_ date offset, in seconds (e.g. 0 means 'right now' and -300 means '5 minutes ago').
+
+For example, a carb entry history might look like this:
+
+```json
+"carbEntries": [
+    {
+        "gramValue": 30, 
+        "dateOffset": -300, 
+        "absorptionTime": 10800
+    }, 
+    {
+        "gramValue": 15, 
+        "dateOffset": 900, 
+        "absorptionTime": 7200, 
+        "enteredAtOffset": -900
+    }
+]
+```
+
+Carb entries have two date offsets: `dateOffset`, which describes the date at which carbs were consumed, and `enteredAtOffset`, which describes the date at which the carb entry was created. The second carb entry in the example above was entered 30 minutes early.
+
+## Generating Scenarios
+
+A Python script with classes corresponding to the entry types is available at `/Scripts/make_scenario.py`. Running it will generate a sample script, which will allow you to inspect the file format in more detail.
+
+## Loading Scenarios
+
+Launch Loop in the Xcode simulator.
+
+Before loading scenarios, mock pump and CGM managers must be enabled in Loop. From the status screen, tap the settings icon in the bottom-right corner; then, tap on each of the pump and CGM rows and select the Simulator option from the presented action sheets:
+
+![](Images/mock_managers.png)
+
+Next, type 'scenario' in the search bar in the bottom-right corner of the Xcode console with the Loop app running:
+
+![](Images/scenarios_url.png)
+
+The first line will include `[TestingScenariosManager]` and a path to the simulator-specific directory in which to place scenario JSON files.
+
+With one or more scenarios placed in the listed directory, the debug menu can be activated by "shaking" the iPhone: in the simulator, press ^⌘Z.  The scenario selection screen will appear:
+
+![](Images/scenarios_menu.png)
+
+Tap on a scenario to select it, then press 'Load' in the top-right corner to load it into Loop.
+
+With the app running, additional scenarios can be added to the scenarios directory; the changes will be detected, and the scenario list reloaded.
+
+## Time Travel
+
+Because all historic date offsets are relative, scenarios can be stepped through one or more loop iterations at a time, so long as the scenario contains sufficient past or future data.
+
+Swiping right or left on a scenario cell reveals the  'rewind' or 'advance' button, respectively:
+
+![](Images/rewind.png)
+
+Tap on the button, and you will be prompted for a number of loop iterations to progress backward or forward in time. Note that advancing forward will run the full algorithm for each step and in turn apply the suggested basal at each decision point.
+
+For convenience, an active scenario can be stepped through without leaving the status screen. Swipe right or left on the toolbar at the bottom of the screen to move one loop iteration into the past or future, respectively.

Documentation/Testing/Images/rewind.png

@@ -84,7 +84,7 @@ class RecommendTempBasalTests: XCTestCase {
     }
 
     var glucoseTargetRange: GlucoseRangeSchedule {
-        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], overrideRanges: [:])!
+        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))])!
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule {
@@ -120,6 +120,25 @@ class RecommendTempBasalTests: XCTestCase {
         XCTAssertNil(dose)
     }
 
+    func testNoChangeOverrideActive() {
+        let glucose = loadGlucoseValueFixture("recommend_temp_basal_no_change_glucose")
+
+        let dose = glucose.recommendedTempBasal(
+            to: glucoseTargetRange,
+            at: glucose.first!.startDate,
+            suspendThreshold: suspendThreshold.quantity,
+            sensitivity: insulinSensitivitySchedule,
+            model: insulinModel,
+            basalRates: basalRateSchedule,
+            maxBasalRate: maxBasalRate,
+            lastTempBasal: nil,
+            isBasalRateScheduleOverrideActive: true
+        )
+
+        XCTAssertEqual(0.8, dose!.unitsPerHour, accuracy: 1.0 / 40.0)
+        XCTAssertEqual(TimeInterval(minutes: 30), dose!.duration)
+    }
+
     func testStartHighEndInRange() {
         let glucose = loadGlucoseValueFixture("recommend_temp_basal_start_high_end_in_range")
 
@@ -472,7 +491,7 @@ class RecommendBolusTests: XCTestCase {
     }
 
     var glucoseTargetRange: GlucoseRangeSchedule {
-        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))], overrideRanges: [:])!
+        return GlucoseRangeSchedule(unit: HKUnit.milligramsPerDeciliter, dailyItems: [RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 90, maxValue: 120))])!
     }
 
     var insulinSensitivitySchedule: InsulinSensitivitySchedule {

Documentation/Testing/Images/scenarios_menu.png

@@ -9,3 +9,13 @@
 // This is automatically disambiguated by development team, but you may choose to change this to
 // support running multiple apps simultaneously.
 MAIN_APP_BUNDLE_IDENTIFIER = com.${DEVELOPMENT_TEAM}.loopkit
+MAIN_APP_DISPLAY_NAME = Loop
+
+APPICON_NAME = AppIcon
+
+// Exclude additional assets by default, and let other configurations that provide them add the file back in
+EXCLUDED_SOURCE_FILE_NAMES = AdditionalAssets.xcassets
+
+// Optional workspace configuration overrides
+#include? "../LoopConfigOverride.xcconfig"
+