Using the configured workout range from LoopKit

Author: loudnate

Cartfile.resolved

@@ -1,6 +1,6 @@
 github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
 github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
-github "loudnate/LoopKit" "370afac5dd1bd700cf1c57297106f3378d56ff1b"
+github "loudnate/LoopKit" "d853848428ddffde2c4341fa39e8ccb754fda24d"
 github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
 github "mddub/dexcom-share-client-swift" "v0.1.3"
 github "loudnate/xDripG5" "0.5.0"

Loop/Managers/DeviceDataManager.swift

@@ -583,7 +583,7 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
                 }
 
                 if let glucoseTargetRangeSchedule = glucoseTargetRangeSchedule {
-                    self.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: glucoseTargetRangeSchedule.unit, dailyItems: glucoseTargetRangeSchedule.items, timeZone: pumpTimeZone)
+                    self.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: glucoseTargetRangeSchedule.unit, dailyItems: glucoseTargetRangeSchedule.items, workoutRange: glucoseTargetRangeSchedule.workoutRange, timeZone: pumpTimeZone)
                 }
             }
         case "pumpModel"?:
@@ -720,15 +720,8 @@ class DeviceDataManager: CarbStoreDelegate, TransmitterDelegate {
             return false
         }
 
-        // Hardcoded: 160-180 mg/dL for 1 hour.
-        let endDate = NSDate(timeIntervalSinceNow: NSTimeInterval(hours: 1))
-        let unit = HKUnit.milligramsPerDeciliterUnit()
-        let targets = DoubleRange(
-            minValue: HKQuantity(unit: unit, doubleValue: 160).doubleValueForUnit(glucoseTargetRangeSchedule.unit),
-            maxValue: HKQuantity(unit: unit, doubleValue: 180).doubleValueForUnit(glucoseTargetRangeSchedule.unit)
-        )
-
-        glucoseTargetRangeSchedule.setOverride(targets, untilDate: endDate)
+        let endDate = NSDate(timeIntervalSinceNow: duration)
+        glucoseTargetRangeSchedule.setWorkoutOverrideUntilDate(endDate)
 
         NSNotificationCenter.defaultCenter().postNotificationName(self.dynamicType.LoopSettingsUpdatedNotification, object: self)
 

Loop/Managers/StatusChartManager.swift

@@ -236,7 +236,7 @@ class StatusChartsManager {
         let allPoints = glucosePoints + predictedGlucosePoints
 
         // TODO: The segment/multiple values are unit-specific
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(allPoints + targetGlucosePoints, minSegmentCount: 2, maxSegmentCount: 4, multiple: 25, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
+        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(allPoints + targetGlucosePoints + targetOverridePoints, minSegmentCount: 2, maxSegmentCount: 4, multiple: 25, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
 
         let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: axisLineColor)
 

Loop/View Controllers/SettingsTableViewController.swift

@@ -425,6 +425,7 @@ class SettingsTableViewController: UITableViewController, DailyValueScheduleTabl
                     scheduleVC.timeZone = schedule.timeZone
                     scheduleVC.scheduleItems = schedule.items
                     scheduleVC.unit = schedule.unit
+                    scheduleVC.workoutRange = schedule.workoutRange
 
                     showViewController(scheduleVC, sender: sender)
                 } else if let glucoseStore = dataManager.glucoseStore {
@@ -583,7 +584,7 @@ class SettingsTableViewController: UITableViewController, DailyValueScheduleTabl
                     }
                 case .GlucoseTargetRange:
                     if let controller = controller as? GlucoseRangeScheduleTableViewController {
-                        dataManager.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
+                        dataManager.glucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, workoutRange: controller.workoutRange, timeZone: controller.timeZone)
                     }
                 case let row:
                     if let controller = controller as? DailyQuantityScheduleTableViewController {