Watch devel plus irc

Common/Models/WatchContext.swift

@@ -41,6 +41,7 @@ final class WatchContext: NSObject, RawRepresentable {
     var reservoir: Double?
     var reservoirPercentage: Double?
     var batteryPercentage: Double?
+    var glucoseGraphImageData: Data?
 
     override init() {
         super.init()
@@ -90,6 +91,7 @@ final class WatchContext: NSObject, RawRepresentable {
         recommendedBolusDose = rawValue["rbo"] as? Double
         COB = rawValue["cob"] as? Double
         maxBolus = rawValue["mb"] as? Double
+        glucoseGraphImageData = rawValue["gg"] as? Data
     }
 
     var rawValue: RawValue {
@@ -117,6 +119,7 @@ final class WatchContext: NSObject, RawRepresentable {
         raw["r"] = reservoir
         raw["rbo"] = recommendedBolusDose
         raw["rp"] = reservoirPercentage
+        raw["gg"] = glucoseGraphImageData
 
         return raw
     }

Loop Status Extension/Base.lproj/MainInterface.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>

Loop/Extensions/NSUserDefaults.swift

@@ -169,7 +169,8 @@ extension UserDefaults {
                     maximumBasalRatePerHour: maximumBasalRatePerHour,
                     maximumBolus: maximumBolus,
                     suspendThreshold: suspendThreshold,
-                    retrospectiveCorrectionEnabled: bool(forKey: "com.loudnate.Loop.RetrospectiveCorrectionEnabled")
+                    retrospectiveCorrectionEnabled: bool(forKey: "com.loudnate.Loop.RetrospectiveCorrectionEnabled"),
+                    integralRetrospectiveCorrectionEnabled: bool(forKey: "com.loopkit.Loop.IntegralRetrospectiveCorrectionEnabled")
                 )
                 self.loopSettings = settings
 

Loop/Managers/AnalyticsManager.swift

@@ -127,6 +127,10 @@ final class AnalyticsManager: IdentifiableClass {
         if newValue.retrospectiveCorrectionEnabled != oldValue.retrospectiveCorrectionEnabled {
             logEvent("Retrospective correction enabled change")
         }
+
+        if newValue.integralRetrospectiveCorrectionEnabled != oldValue.integralRetrospectiveCorrectionEnabled {
+            logEvent("Integral retrospective correction enabled change")
+        }
     }
 
     // MARK: - Loop Events

Loop/Models/LoopSettings.swift

@@ -23,6 +23,8 @@ struct LoopSettings {
     var suspendThreshold: GlucoseThreshold? = nil
 
     var retrospectiveCorrectionEnabled = true
+
+    var integralRetrospectiveCorrectionEnabled = true
 }
 
 
@@ -74,13 +76,18 @@ extension LoopSettings: RawRepresentable {
         if let retrospectiveCorrectionEnabled = rawValue["retrospectiveCorrectionEnabled"] as? Bool {
             self.retrospectiveCorrectionEnabled = retrospectiveCorrectionEnabled
         }
+
+        if let integralRetrospectiveCorrectionEnabled = rawValue["integralRetrospectiveCorrectionEnabled"] as? Bool {
+            self.integralRetrospectiveCorrectionEnabled = integralRetrospectiveCorrectionEnabled
+        }
     }
 
     var rawValue: RawValue {
         var raw: RawValue = [
             "version": LoopSettings.version,
             "dosingEnabled": dosingEnabled,
-            "retrospectiveCorrectionEnabled": retrospectiveCorrectionEnabled
+            "retrospectiveCorrectionEnabled": retrospectiveCorrectionEnabled,
+            "integralRetrospectiveCorrectionEnabled": integralRetrospectiveCorrectionEnabled
         ]
 
         raw["glucoseTargetRangeSchedule"] = glucoseTargetRangeSchedule?.rawValue

Loop/View Controllers/PredictionTableViewController.swift

@@ -187,6 +187,13 @@ class PredictionTableViewController: ChartsTableViewController, IdentifiableClas
         static let count = 3
     }
 
+    fileprivate enum SettingsRow: Int, CaseCountable {
+        case retrospectiveCorrection
+        case integralRetrospectiveCorrection
+
+        static let count = 2
+    }
+
     private var eventualGlucoseDescription: String?
 
     private var availableInputs: [PredictionInputEffect] = [.carbs, .insulin, .momentum, .retrospection]
@@ -204,7 +211,7 @@ class PredictionTableViewController: ChartsTableViewController, IdentifiableClas
         case .inputs:
             return availableInputs.count
         case .settings:
-            return 1
+            return SettingsRow.count
         }
     }
 
@@ -231,12 +238,22 @@ class PredictionTableViewController: ChartsTableViewController, IdentifiableClas
         case .settings:
             let cell = tableView.dequeueReusableCell(withIdentifier: SwitchTableViewCell.className, for: indexPath) as! SwitchTableViewCell
 
-            cell.titleLabel?.text = NSLocalizedString("Enable Retrospective Correction", comment: "Title of the switch which toggles retrospective correction effects")
-            cell.subtitleLabel?.text = NSLocalizedString("This will more aggresively increase or decrease basal delivery when glucose movement doesn't match the carbohydrate and insulin-based model.", comment: "The description of the switch which toggles retrospective correction effects")
-            cell.`switch`?.isOn = deviceManager.loopManager.settings.retrospectiveCorrectionEnabled
-            cell.`switch`?.addTarget(self, action: #selector(retrospectiveCorrectionSwitchChanged(_:)), for: .valueChanged)
-
-            cell.contentView.layoutMargins.left = tableView.separatorInset.left
+            switch SettingsRow(rawValue: indexPath.row)! {
+            case .retrospectiveCorrection:
+                cell.titleLabel?.text = NSLocalizedString("Retrospective Correction", comment: "Title of the switch which toggles retrospective correction effects")
+                cell.subtitleLabel?.text = NSLocalizedString("More agressively increase or decrease basal delivery when  glucose movement over past 30 min doesn't match the carbohydrate and insulin-based model.", comment: "The description of the switch which toggles retrospective correction effects")
+                cell.`switch`?.isOn = deviceManager.loopManager.settings.retrospectiveCorrectionEnabled
+                cell.`switch`?.addTarget(self, action: #selector(retrospectiveCorrectionSwitchChanged(_:)), for: .valueChanged)
+
+                cell.contentView.layoutMargins.left = tableView.separatorInset.left
+            case .integralRetrospectiveCorrection:
+                cell.titleLabel?.text = NSLocalizedString("Integral Retrospective Correction", comment: "Title of the switch which toggles integral retrospective correction effects")
+                cell.subtitleLabel?.text = NSLocalizedString("Respond more aggressively to persistent discrepancies in glucose movement.", comment: "The description of the switch which toggles integral retrospective correction effects")
+                cell.`switch`?.isOn = deviceManager.loopManager.settings.integralRetrospectiveCorrectionEnabled
+                cell.`switch`?.addTarget(self, action: #selector(integralRetrospectiveCorrectionSwitchChanged(_:)), for: .valueChanged)
+
+                cell.contentView.layoutMargins.left = tableView.separatorInset.left
+            }
 
             return cell
         }
@@ -267,20 +284,48 @@ class PredictionTableViewController: ChartsTableViewController, IdentifiableClas
 
         var subtitleText = input.localizedDescription(forGlucoseUnit: charts.glucoseUnit) ?? ""
 
-        if input == .retrospection,
-            let startGlucose = retrospectivePredictedGlucose?.first,
-            let endGlucose = retrospectivePredictedGlucose?.last,
-            let currentGlucose = self.deviceManager.loopManager.glucoseStore.latestGlucose
-        {
-            let formatter = NumberFormatter.glucoseFormatter(for: charts.glucoseUnit)
-            let values = [startGlucose, endGlucose, currentGlucose].map { formatter.string(from: NSNumber(value: $0.quantity.doubleValue(for: charts.glucoseUnit))) ?? "?" }
-
-            let retro = String(
-                format: NSLocalizedString("Last comparison: %1$@ → %2$@ vs %3$@", comment: "Format string describing retrospective glucose prediction comparison. (1: Previous glucose)(2: Predicted glucose)(3: Actual glucose)"),
-                values[0], values[1], values[2]
-            )
-
-            subtitleText = String(format: "%@\n%@", subtitleText, retro)
+        if input == .retrospection {
+            if deviceManager.loopManager.settings.retrospectiveCorrectionEnabled,
+                let startGlucose = retrospectivePredictedGlucose?.first,
+                let endGlucose = retrospectivePredictedGlucose?.last,
+                let currentGlucose = self.deviceManager.loopManager.glucoseStore.latestGlucose
+            {
+                let formatter = NumberFormatter.glucoseFormatter(for: charts.glucoseUnit)
+                let values = [startGlucose, endGlucose, currentGlucose].map { formatter.string(from: NSNumber(value: $0.quantity.doubleValue(for: charts.glucoseUnit))) ?? "?" }
+                let endGlucoseValue = endGlucose.quantity.doubleValue(for: charts.glucoseUnit)
+                let currentGlucoseValue = currentGlucose.quantity.doubleValue(for: charts.glucoseUnit)
+                let currentDiscrepancyValue = currentGlucoseValue - endGlucoseValue
+                let currentDiscrepancy = formatter.string(from: NSNumber(value: currentDiscrepancyValue))!
+                var integralEffect = "none"
+                var retrospectiveCorrection = "none"
+                if self.deviceManager.loopManager.overallRetrospectiveCorrection != nil {
+                    //Retrospective Correction effect included in glucose prediction
+                    let overallRetrospectiveCorrectionValue = self.deviceManager.loopManager.overallRetrospectiveCorrection!.doubleValue(for: charts.glucoseUnit)
+                    let integralEffectValue = overallRetrospectiveCorrectionValue - currentDiscrepancyValue
+                    integralEffect = formatter.string(from: NSNumber(value: integralEffectValue))!
+                    retrospectiveCorrection = formatter.string(from: NSNumber(value: overallRetrospectiveCorrectionValue))!
+                }
+                if !deviceManager.loopManager.settings.integralRetrospectiveCorrectionEnabled {
+                    integralEffect = "disabled"
+                }
+                let retroComparison = String(
+                    format: NSLocalizedString("Last 30 min comparison: %1$@ → %2$@ vs %3$@", comment: "Format string describing retrospective glucose prediction comparison. (1: Previous glucose)(2: Predicted glucose)(3: Actual glucose)"),
+                    values[0], values[1], values[2])
+                let retroCorrection = String(
+                    format: NSLocalizedString("RC effect: %1$@, Integral effect: %2$@\nTotal glucose effect: %3$@", comment: "Format string describing retrospective correction. (1: Current discrepancy)(2: Integral retrospective correction effect)(3: Total retrospective correction effect)"), currentDiscrepancy, integralEffect, retrospectiveCorrection)
+
+                subtitleText = String(format: "%@\n%@", retroComparison, retroCorrection)
+
+            } else {
+                // Retrospective Correction disabled or not included in glucose prediction for other reasons
+                if deviceManager.loopManager.settings.retrospectiveCorrectionEnabled {
+                    let inactiveRetrospectiveCorrection = String(format: NSLocalizedString("Temporarily inactive due to recent calibration or missing data", comment: "Format string describing inactive retrospective correction."))
+                    subtitleText = String(format: "%@", inactiveRetrospectiveCorrection)
+                } else {
+                    let disabledRetrospectiveCorrection = String(format: NSLocalizedString("⚠️ Retrospective correction is disabled", comment: "Format string describing disabled retrospective correction."))
+                    subtitleText = String(format: "%@\n%@", subtitleText, disabledRetrospectiveCorrection)
+                }
+            }
         }
 
         cell.subtitleLabel?.text = subtitleText
@@ -328,11 +373,23 @@ class PredictionTableViewController: ChartsTableViewController, IdentifiableClas
 
     @objc private func retrospectiveCorrectionSwitchChanged(_ sender: UISwitch) {
         deviceManager.loopManager.settings.retrospectiveCorrectionEnabled = sender.isOn
-
+        // if retrospective correction is disabled, integral retrospective correction must also be disabled
+        if !sender.isOn {
+            deviceManager.loopManager.settings.integralRetrospectiveCorrectionEnabled = sender.isOn
+        }
+
         if  let row = availableInputs.index(where: { $0 == .retrospection }),
             let cell = tableView.cellForRow(at: IndexPath(row: row, section: Section.inputs.rawValue)) as? PredictionInputEffectTableViewCell
         {
             cell.enabled = self.deviceManager.loopManager.settings.retrospectiveCorrectionEnabled
         }
     }
+
+    @objc private func integralRetrospectiveCorrectionSwitchChanged(_ sender: UISwitch) {
+        deviceManager.loopManager.settings.integralRetrospectiveCorrectionEnabled = sender.isOn
+        // if integral retrospective correction is enabled, retrospective correction must also be enabled
+        if sender.isOn {
+            deviceManager.loopManager.settings.retrospectiveCorrectionEnabled = sender.isOn
+        }
+    }
 }

WatchApp Extension/Controllers/StatusInterfaceController.swift

@@ -12,11 +12,13 @@ import WatchConnectivity
 
 final class StatusInterfaceController: WKInterfaceController, ContextUpdatable {
 
+    @IBOutlet weak var glucoseGraph: WKInterfaceImage!
     @IBOutlet weak var loopHUDImage: WKInterfaceImage!
     @IBOutlet weak var loopTimer: WKInterfaceTimer!
     @IBOutlet weak var glucoseLabel: WKInterfaceLabel!
     @IBOutlet weak var eventualGlucoseLabel: WKInterfaceLabel!
     @IBOutlet weak var statusLabel: WKInterfaceLabel!
+    @IBOutlet weak var basalLabel: WKInterfaceLabel!
 
     @IBOutlet var preMealButton: WKInterfaceButton!
     @IBOutlet var preMealButtonImage: WKInterfaceImage!
@@ -177,7 +179,69 @@ final class StatusInterfaceController: WKInterfaceController, ContextUpdatable {
         }
 
         // TODO: Other elements
+        let insulinFormatter: NumberFormatter = {
+            let numberFormatter = NumberFormatter()
+
+            numberFormatter.numberStyle = .decimal
+            numberFormatter.minimumFractionDigits = 1
+            numberFormatter.maximumFractionDigits = 1
+
+            return numberFormatter
+        }()
+
         statusLabel.setHidden(true)
+        var statusLabelText = ""
+
+        if let activeInsulin = context?.IOB, let valueStr = insulinFormatter.string(from:NSNumber(value:activeInsulin))
+        {
+            statusLabelText = String(format: NSLocalizedString(
+                "IOB %1$@ U",
+                comment: "The subtitle format describing units of active insulin. (1: localized insulin value description)"),
+                                       valueStr)
+        }
+
+        if let carbsOnBoard = context?.COB
+        {
+            let carbFormatter = NumberFormatter()
+            carbFormatter.numberStyle = .decimal
+            carbFormatter.maximumFractionDigits = 0
+            let valueStr = carbFormatter.string(from:NSNumber(value:carbsOnBoard))
+
+            if statusLabelText != "" { // Not empty - add space; TODO layout properly
+                statusLabelText += "  "
+            }
+            statusLabelText += String(format: NSLocalizedString(
+                "COB %1$@ g",
+                comment: "The subtitle format describing grams of active carbs. (1: localized carb value description)"),
+                                      valueStr!)
+        }
+
+        basalLabel.setHidden(true)
+        if let tempBasal = context?.lastNetTempBasalDose {
+            let basalFormatter = NumberFormatter()
+            basalFormatter.numberStyle = .decimal
+            basalFormatter.minimumFractionDigits = 1
+            basalFormatter.maximumFractionDigits = 3
+            basalFormatter.positivePrefix = basalFormatter.plusSign
+            let valueStr = basalFormatter.string(from:NSNumber(value:tempBasal))
+
+            let basalLabelText = String(format: NSLocalizedString(
+                "%1$@ U/hr",
+                comment: "The subtitle format describing the current temp basal rate. (1: localized basal rate description)"),
+                                      valueStr!)
+            basalLabel.setText(basalLabelText)
+            basalLabel.setHidden(false)
+        }
+
+        statusLabel.setText(statusLabelText)
+        statusLabel.setHidden(false)
+
+        glucoseGraph.setHidden(true)
+        if let glucoseGraphImageData = context?.glucoseGraphImageData, let glucoseGraphImage = UIImage(data: glucoseGraphImageData) {
+            glucoseGraph.setImage(glucoseGraphImage)
+            glucoseGraph.setHidden(false)
+        }
+
     }
 
     private func updateForOverrideContext(_ context: GlucoseRangeScheduleOverrideUserInfo.Context?) {