Miscellaneous Omnipod code improvements & cleanup

OmniKit/OmnipodCommon/Pod.swift

@@ -53,15 +53,15 @@ public struct Pod {
     public static let reservoirCapacity: Double = 200
 
     // Supported basal rates
-    // Eros minimum scheduled basal rate is 0.05 U/H while for Dash supports 0 U/H.
-    // Would need to have this value based on productID to be able to share this with Eros.
+    // Eros minimum scheduled basal rate is 0.05 U/hr while Dash supports 0 U/hr.
     public static let supportedBasalRates: [Double] = (1...600).map { Double($0) / Double(pulsesPerUnit) }
 
     // Supported temp basal rates
+    // Both Eros and Dash support a minimum temp basal rate of 0 U/hr.
     public static let supportedTempBasalRates: [Double] = (0...600).map { Double($0) / Double(pulsesPerUnit) }
 
-    // The internal basal rate used for non-Eros pods
-    // Would need to have this value based on productID to be able to share this file with Eros.
+    // The internal basal rate used for zero basal rates
+    // Eros uses 0.0 while Dash uses a near zero rate
     public static let zeroBasalRate: Double = 0.0
 
     // Maximum number of basal schedule entries supported
@@ -113,19 +113,46 @@ public enum DeliveryStatus: UInt8, CustomStringConvertible {
     case extendedBolusAndTempBasal = 10
 
     public var suspended: Bool {
-        return self == .suspended || self == .priming || self == .extendedBolusWhileSuspended
+        // returns true if both the tempBasal and basal bits are clear
+        let suspendedStates: Set<DeliveryStatus> = [
+            .suspended,
+            .priming,
+            .extendedBolusWhileSuspended,
+        ]
+        return suspendedStates.contains(self)
     }
 
     public var bolusing: Bool {
-        return self == .bolusInProgress || self == .bolusAndTempBasal || self == .extendedBolusRunning || self == .extendedBolusAndTempBasal || self == .priming || self == .extendedBolusWhileSuspended
+        // returns true if either the immediateBolus or extendedBolus bits are set
+        let bolusingStates: Set<DeliveryStatus> = [
+            .priming,
+            .bolusInProgress,
+            .bolusAndTempBasal,
+            .extendedBolusWhileSuspended,
+            .extendedBolusRunning,
+            .extendedBolusAndTempBasal,
+        ]
+        return bolusingStates.contains(self)
     }
 
     public var tempBasalRunning: Bool {
-        return self == .tempBasalRunning || self == .bolusAndTempBasal || self == .extendedBolusAndTempBasal
+        // returns true if the tempBasal bit is set
+        let tempBasalRunningStates: Set<DeliveryStatus> = [
+            .tempBasalRunning,
+            .bolusAndTempBasal,
+            .extendedBolusAndTempBasal,
+        ]
+        return tempBasalRunningStates.contains(self)
     }
 
     public var extendedBolusRunning: Bool {
-        return self == .extendedBolusRunning || self == .extendedBolusAndTempBasal || self == .extendedBolusWhileSuspended
+        // returns true if the extendedBolus bit is set
+        let extendedBolusRunningStates: Set<DeliveryStatus> = [
+            .extendedBolusWhileSuspended,
+            .extendedBolusRunning,
+            .extendedBolusAndTempBasal,
+        ]
+        return extendedBolusRunningStates.contains(self)
     }
 
     public var description: String {

OmniKit/PumpManager/OmnipodPumpManager.swift

@@ -1871,7 +1871,7 @@ extension OmnipodPumpManager: PumpManager {
             })
 
             if let podState = self.state.podState, podState.isSuspended || podState.lastDeliveryStatusReceived?.suspended == true {
-                self.log.error("Not enacting bolus because podState or last status received indicates pod is suspended")
+                self.log.info("Not enacting bolus because podState or last status received indicates pod is suspended")
                 completion(.deviceState(PodCommsError.podSuspended))
                 return
             }
@@ -2053,7 +2053,7 @@ extension OmnipodPumpManager: PumpManager {
                     return
                 }
 
-                guard status.deliveryStatus != .suspended else {
+                guard !status.deliveryStatus.suspended else {
                     self.log.info("Canceling temp basal because status return indicates pod is suspended!")
                     completion(.communication(PodCommsError.podSuspended))
                     return
@@ -2448,12 +2448,10 @@ extension OmnipodPumpManager: PumpManager {
 
 extension OmnipodPumpManager: MessageLogger {
     func didSend(_ message: Data) {
-        log.default("didSend: %{public}@", message.hexadecimalString)
         self.logDeviceCommunication(message.hexadecimalString, type: .send)
     }
 
     func didReceive(_ message: Data) {
-        log.default("didReceive: %{public}@", message.hexadecimalString)
         self.logDeviceCommunication(message.hexadecimalString, type: .receive)
     }
 

OmniKit/PumpManager/PodState.swift

@@ -300,7 +300,7 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
         if deliveryStatus.tempBasalRunning && unfinalizedTempBasal == nil { // active temp basal that we aren't tracking
             // unfinalizedTempBasal = UnfinalizedDose(tempBasalRate: 0, startTime: Date(), duration: .minutes(30), isHighTemp: false, scheduledCertainty: .certain, insulinType: insulinType)
         }
-        if deliveryStatus != .suspended && isSuspended { // active basal that we aren't tracking
+        if !deliveryStatus.suspended && isSuspended { // active basal that we aren't tracking
             let resumeStartTime = Date()
             suspendState = .resumed(resumeStartTime)
             unfinalizedResume = UnfinalizedDose(resumeStartTime: resumeStartTime, scheduledCertainty: .certain, insulinType: insulinType)
@@ -555,7 +555,7 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
             "* expiresAt: \(String(reflecting: expiresAt))",
             "* podTime: \(podTime.timeIntervalStr)",
             "* podTimeUpdated: \(String(reflecting: podTimeUpdated))",
-            "* setupUnitsDelivered: \(String(reflecting: setupUnitsDelivered))",
+            "* setupUnitsDelivered: \(setupUnitsDelivered == nil ? "?" : setupUnitsDelivered!.twoDecimals) U",
             "* piVersion: \(piVersion)",
             "* pmVersion: \(pmVersion)",
             "* lot: \(lot)",
@@ -568,6 +568,8 @@ public struct PodState: RawRepresentable, Equatable, CustomDebugStringConvertibl
             "* unfinalizedResume: \(String(describing: unfinalizedResume))",
             "* finalizedDoses: \(String(describing: finalizedDoses))",
             "* activeAlertsSlots: \(alertSetString(alertSet: activeAlertSlots))",
+            "* delivered: \(lastInsulinMeasurements == nil ? "?" : lastInsulinMeasurements!.delivered.twoDecimals) U",
+            "* reservoirLevel: \(lastInsulinMeasurements == nil || lastInsulinMeasurements!.reservoirLevel == nil || lastInsulinMeasurements!.reservoirLevel == Pod.reservoirLevelAboveThresholdMagicNumber ? "50+" : lastInsulinMeasurements!.reservoirLevel!.twoDecimals) U",
             "* messageTransportState: \(String(describing: messageTransportState))",
             "* setupProgress: \(setupProgress)",
             "* primeFinishTime: \(String(describing: primeFinishTime))",