Remove debugging prints and patchable variables

Trio/Sources/APS/DeviceDataManager.swift

@@ -14,8 +14,6 @@ import SwiftDate
 import Swinject
 import UserNotifications
 
-var fakePumpUnavailable = false
-
 protocol DeviceDataManager: GlucoseSource {
     var pumpManager: PumpManagerUI? { get set }
     var bluetoothManager: BluetoothStateManager { get }
@@ -417,26 +415,21 @@ extension BaseDeviceDataManager: PumpManagerDelegate {
             bolusTrigger.send(false)
         }
 
-        // New code to set pumpSuspended variable here instead
-        // in Modules/Home/HomeStateModel+Setup/PumpHistorySetup.
-        // Works well with new scheduleBasal state variable.
+        /// The new suspended and scheduledBasal PassthroughSubject var's are set here based on the PM's basalDeliveryState.
+        /// Setting suspended here replaces the pumpSuspended state var that used to be incorrectly set in updateInsulinArray().
 
         switch status.basalDeliveryState {
         case let .active(at):
-            if at == .distantPast || fakePumpUnavailable {
-                print("@@@ scheduledBasal.send(nil)")
+            if at == .distantPast {
                 scheduledBasal.send(nil) // pump is not currently available
             } else {
-                print("@@@ basalDeliveryState active: suspended.send(false) & scheduledBasal.send(true)")
                 suspended.send(false)
                 scheduledBasal.send(true)
             }
         case .suspended:
-            print("@@@ basalDeliveryState suspended: suspended.send(true), scheduledBasal.send(false)")
             suspended.send(true)
             scheduledBasal.send(false)
         default:
-            print("@@@ basalDeliveryState default: suspended.send(false) & scheduledBasal.send(false)")
             suspended.send(false)
             scheduledBasal.send(false)
         }

Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -188839,9 +188839,6 @@
         }
       }
     },
-    "Pump suspended [History]" : {
-
-    },
     "Pump Suspension" : {
       "localizations" : {
         "bg" : {
@@ -199133,9 +199130,6 @@
         }
       }
     },
-    "Scheduled basal" : {
-
-    },
     "Scheduled Basal Rate" : {
       "localizations" : {
         "bg" : {

Trio/Sources/Modules/Home/HomeStateModel+Setup/PumpHistorySetup.swift

@@ -41,36 +41,14 @@ extension Home.StateModel {
         insulinFromPersistence = insulinObjects
 
         manualTempBasal = apsManager.isManualTempBasal
-        tempBasals = insulinFromPersistence.filter({ $0.tempBasal != nil })
+        tempBasals = insulinFromPersistence.filter { $0.tempBasal != nil }
 
-        /// suspensions is a list of pump suspend and resume events
+        /// The suspensions variable is actually is a list of all pump suspend and resume events
         suspensions = insulinFromPersistence.filter {
             $0.type == EventType.pumpSuspend.rawValue || $0.type == EventType.pumpResume.rawValue
         }
 
-        let lastSuspendResume = suspensions.last
-        let lastSuspendResumeWasSuspend = lastSuspendResume?.type == EventType.pumpSuspend.rawValue
-
-        print(
-            "@@@ tempBasals.last time=\(String(describing: tempBasals.last?.timestamp)), lastSuspendResume time=\(String(describing: lastSuspendResume?.timestamp)), lastSuspendResumeWasSuspend=\(lastSuspendResumeWasSuspend)"
-        )
-
-        /// This test fails to properly set pumpSuspended to true when a pump is suspended (at least for pods).
-        /// Will only set pumpSuspended to true if there was a TB operation done after the pump suspend/resume event.
-        pumpSuspended = tempBasals.last?.timestamp ?? Date() > lastSuspendResume?
-            .timestamp ?? .distantPast && lastSuspendResumeWasSuspend
-        print(
-            "@@@ original calculation would have set pumpSuspended to \(pumpSuspended)"
-        )
-
-        /// Maybe this tempBasalPostSuspendResume test from Open-APS was to deal with old PM's that might allow a temp basal on
-        /// a suspended pump &/or perhaps something related to traditional insulin pumps that can be suspended/resumed on the pump?
-        let tempBasalPostSuspendResume = tempBasals
-            .last { $0.timestamp ?? .distantPast > (lastSuspendResume?.timestamp ?? .distantPast) }
-        pumpSuspended = tempBasalPostSuspendResume == nil && lastSuspendResumeWasSuspend
-        print(
-            "@@@ new calculation sets pumpSuspended to \(pumpSuspended)"
-        )
+        /// Determining if the pump is currently suspended is now handled in DeviceDataManager
     }
 
     // Setup Last Bolus to display the bolus progress bar

Trio/Sources/Modules/Home/HomeStateModel.swift

@@ -40,7 +40,6 @@ extension Home {
         var targetProfiles: [TargetProfile] = []
         var timerDate = Date()
         var closedLoop = false
-        var pumpSuspended = false
         var isLooping = false
         var statusTitle = ""
         var lastLoopDate: Date = .distantPast
@@ -92,7 +91,7 @@ extension Home {
         var fetchedTDDs: [TDD] = []
         var insulinFromPersistence: [PumpEventStored] = []
         var tempBasals: [PumpEventStored] = []
-        var suspensions: [PumpEventStored] = []
+        var suspensions: [PumpEventStored] = [] // all of the pump suspend and resume events
         var batteryFromPersistence: [OpenAPS_Battery] = []
         var lastPumpBolus: PumpEventStored?
         var overrides: [OverrideStored] = []

Trio/Sources/Modules/Home/View/HomeRootView.swift

@@ -4,9 +4,6 @@ import SwiftDate
 import SwiftUI
 import Swinject
 
-private var origPumpSuspendedFromHistory = false
-private var skipScheduledBasalRate = false
-
 struct TimePicker: Identifiable {
     var active: Bool
     let hours: Int16
@@ -167,7 +164,6 @@ extension Home {
 
         var basalString: String? {
             var rate: NSNumber = 0
-            var scheduledBasalPrefix = ""
             var manualBasalString = ""
 
             guard let apsManager = state.apsManager else {
@@ -178,7 +174,6 @@ extension Home {
                 guard let scheduledRate = scheduledBasalDeliveryRate(at: Date()) else {
                     return nil
                 }
-                // scheduledBasalPrefix = "SB "
                 rate = scheduledRate
             } else {
                 guard let lastTempBasal = state.tempBasals.last?.tempBasal, let tempRate = lastTempBasal.rate else {
@@ -194,7 +189,7 @@ extension Home {
             }
 
             let rateString = Formatter.decimalFormatterWithTwoFractionDigits.string(from: rate) ?? "0"
-            return scheduledBasalPrefix + rateString + String(localized: " U/hr", comment: "Unit per hour with space") +
+            return rateString + String(localized: " U/hr", comment: "Unit per hour with space") +
                 manualBasalString
         }
 
@@ -502,13 +497,9 @@ extension Home {
                 } else {
                     HStack {
                         if state.apsManager?.isScheduledBasal == nil {
-                            /// The pump not currently available (e.g., no pod)
+                            /// The pump is not currently available (e.g., no pod) so
                             /// display no insulin delivery info rather than "Pump suspended"
-                        } else if origPumpSuspendedFromHistory && state.pumpSuspended {
-                            Text("Pump suspended [History]")
-                                .font(.callout).fontWeight(.bold).fontDesign(.rounded)
-                                .foregroundColor(.loopGray)
-                        } else if !origPumpSuspendedFromHistory && state.apsManager.isSuspended {
+                        } else if state.apsManager.isSuspended {
                             Text("Pump suspended")
                                 .font(.callout).fontWeight(.bold).fontDesign(.rounded)
                                 .foregroundColor(.loopGray)
@@ -516,23 +507,17 @@ extension Home {
                             Image(systemName: "drop.circle")
                                 .font(.callout)
                                 .foregroundColor(.insulinTintColor)
-                            if skipScheduledBasalRate && state.apsManager?.isScheduledBasal == true {
-                                if state.apsManager?.isScheduledBasal == true {
-                                    Text("Scheduled basal")
-                                        .font(.callout).fontWeight(.bold).fontDesign(.rounded)
-                                        .foregroundColor(.loopGray)
-                                }
-                            } else if let basalString = basalString {
-                                // If running a scheduled basal, display basalString in blue instead of black
-                                let color: Color = state.apsManager?.isScheduledBasal == true ? .blue : .black
+                            if let basalString = self.basalString {
+                                // If running a scheduled basal, display basalString in loopGray instead of black
+                                let color: Color = state.apsManager?.isScheduledBasal == true ? .loopGray : .black
                                 if basalString.count > 5 {
                                     Text(basalString)
                                         .font(.callout).fontWeight(.bold).fontDesign(.rounded)
-                                        .foregroundColor(color)
                                         .lineLimit(1)
                                         .minimumScaleFactor(0.85)
                                         .truncationMode(.tail)
                                         .allowsTightening(true)
+                                        .foregroundColor(color)
                                 } else {
                                     // Short strings can just display normally
                                     Text(basalString)