Loop predictive low alarm uses the full forecast

LoopFollow/Charts/BGChartStubs.swift

@@ -90,6 +90,8 @@ extension MainViewController {
 
     // Removes the Loop forecast line. Used when the active system switches away from Loop.
     func clearLoopPredictionGraph() {
+        loopPredBGs = nil
+        loopPredUpdatedTime = nil
         guard !predictionData.isEmpty else { return }
         predictionData.removeAll()
         updatePredictionGraph()

LoopFollow/Controllers/Nightscout/DeviceStatusLoop.swift

@@ -73,7 +73,9 @@ extension MainViewController {
             {
                 Observable.shared.predictionText.value = Localizer.toDisplayUnits(String(Int(round(lastPrediction))))
                 Observable.shared.predictionColor.value = .purple
-                if Storage.shared.downloadPrediction.value, previousLastLoopTime < lastLoopTime || predictionData.isEmpty {
+                loopPredBGs = prediction
+                loopPredUpdatedTime = lastLoopTime
+                if previousLastLoopTime < lastLoopTime || predictionData.isEmpty {
                     predictionData.removeAll()
                     var predictionTime = lastLoopTime
                     let toLoad = Int(Storage.shared.predictionToLoad.value * 12)
@@ -101,6 +103,8 @@ extension MainViewController {
                     updatePredictionGraph()
                 }
             } else {
+                loopPredBGs = nil
+                loopPredUpdatedTime = nil
                 predictionData.removeAll()
                 infoManager.clearInfoData(type: .minMax)
                 updatePredictionGraph()

LoopFollow/Settings/AdvancedSettingsView.swift

@@ -10,7 +10,6 @@ struct AdvancedSettingsView: View {
         Form {
             Section(header: Text("Advanced Settings")) {
                 Toggle("Download Treatments", isOn: $viewModel.downloadTreatments)
-                Toggle("Download Prediction", isOn: $viewModel.downloadPrediction)
                 Toggle("Graph Basal", isOn: $viewModel.graphBasal)
                 Toggle("Graph Bolus", isOn: $viewModel.graphBolus)
                 Toggle("Graph Carbs", isOn: $viewModel.graphCarbs)

LoopFollow/Settings/AdvancedSettingsViewModel.swift

@@ -10,12 +10,6 @@ class AdvancedSettingsViewModel: ObservableObject {
         }
     }
 
-    @Published var downloadPrediction: Bool {
-        didSet {
-            Storage.shared.downloadPrediction.value = downloadPrediction
-        }
-    }
-
     @Published var graphBasal: Bool {
         didSet {
             Storage.shared.graphBasal.value = graphBasal
@@ -58,7 +52,6 @@ class AdvancedSettingsViewModel: ObservableObject {
 
     init() {
         downloadTreatments = Storage.shared.downloadTreatments.value
-        downloadPrediction = Storage.shared.downloadPrediction.value
         graphBasal = Storage.shared.graphBasal.value
         graphBolus = Storage.shared.graphBolus.value
         graphCarbs = Storage.shared.graphCarbs.value

LoopFollow/Storage/Storage.swift

@@ -183,7 +183,6 @@ class Storage {
     // MARK: - Advanced settings ---------------------------------------------------
 
     var downloadTreatments = StorageValue<Bool>(key: "downloadTreatments", defaultValue: true)
-    var downloadPrediction = StorageValue<Bool>(key: "downloadPrediction", defaultValue: true)
     var graphOtherTreatments = StorageValue<Bool>(key: "graphOtherTreatments", defaultValue: true)
     var graphBasal = StorageValue<Bool>(key: "graphBasal", defaultValue: true)
     var graphBolus = StorageValue<Bool>(key: "graphBolus", defaultValue: true)

LoopFollow/Task/AlarmTask.swift

@@ -79,14 +79,17 @@ extension MainViewController {
     /// Builds the forward glucose series the low alarm looks ahead in,
     /// oldest .. newest at 5-minute spacing.
     ///
-    /// Loop reports a single forecast, already stored in `predictionData`. Trio
-    /// reports four forecasts, collapsed into the lowest value per point in time
-    /// by `lowestForecast(forecasts:start:cap:)`.
+    /// Both series come from the full forecast as uploaded, independent of the
+    /// graph settings. Loop reports a single forecast; Trio reports four,
+    /// collapsed into the lowest value per point in time by
+    /// `lowestForecast(forecasts:start:cap:)`.
     func alarmPredictionData() -> [GlucoseValue] {
         if Storage.shared.device.value == "Loop" {
-            return predictionData
-                .prefix(MainViewController.alarmForecastPointCap)
-                .map { GlucoseValue(sgv: $0.sgv, date: Date(timeIntervalSince1970: $0.date)) }
+            guard let predBGs = loopPredBGs else { return [] }
+            return MainViewController.lowestForecast(
+                forecasts: [predBGs],
+                start: loopPredUpdatedTime ?? Date().timeIntervalSince1970
+            )
         }
 
         guard let predBGs = openAPSPredBGs else { return [] }

LoopFollow/ViewControllers/MainViewController.swift

@@ -91,6 +91,8 @@ class MainViewController: UIViewController, UNUserNotificationCenterDelegate {
     var iobPredictionData: [ShareGlucoseData] = []
     var cobPredictionData: [ShareGlucoseData] = []
     var uamPredictionData: [ShareGlucoseData] = []
+    var loopPredBGs: [Double]?
+    var loopPredUpdatedTime: TimeInterval?
     var openAPSPredBGs: [String: [Double]]?
     var openAPSPredUpdatedTime: TimeInterval?
     var bgCheckData: [ShareGlucoseData] = []