Backport OmniBLE PR Artificial-Pancreas#94 & Artificial-Pancreas#105,…

… OmniKit PR Artificial-Pancreas#9 & Artificial-Pancreas#18 and MinimedKit PR Artificial-Pancreas#6 (Artificial-Pancreas#438) + Extend low reservoir notification range + Prevent negative duration doses, which can happen if the phone clock is changed + Fixes Loop crash when changing time back and cancelling bolus, Loop Issue #2057
dnzxy · Dec 30, 2023 · 97b90fd · 97b90fd
1 parent ebc1dfd
commit 97b90fd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/Dependencies/MinimedKit/MinimedKit/PumpManager/UnfinalizedDose.swift b/Dependencies/MinimedKit/MinimedKit/PumpManager/UnfinalizedDose.swift
@@ -117,7 +117,9 @@ public struct UnfinalizedDose: RawRepresentable, Equatable, CustomStringConverti
 
         let programmedUnits = units
         self.programmedUnits = programmedUnits
-        let newDuration = date.timeIntervalSince(startTime)
+
+        // Guard against negative duration if clock has changed
+        let newDuration = max(0, date.timeIntervalSince(startTime))
 
         switch doseType {
         case .bolus:

diff --git a/Dependencies/OmniBLE/OmniBLE/OmnipodCommon/Pod.swift b/Dependencies/OmniBLE/OmniBLE/OmnipodCommon/Pod.swift
@@ -93,7 +93,7 @@ public struct Pod {
     public static let defaultLowReservoirReminder: Double = 10
 
     // Allowed Low Reservoir reminder values
-    public static let allowedLowReservoirReminderValues = Array(stride(from: 10, through: 50, by: 1))
+    public static let allowedLowReservoirReminderValues = Array(stride(from: 1, through: 50, by: 1))
 }
 
 // DeliveryStatus used in StatusResponse and DetailedStatus

diff --git a/Dependencies/OmniBLE/OmniBLE/OmnipodCommon/UnfinalizedDose.swift b/Dependencies/OmniBLE/OmniBLE/OmnipodCommon/UnfinalizedDose.swift
@@ -147,7 +147,9 @@ public struct UnfinalizedDose: RawRepresentable, Equatable, CustomStringConverti
         }
 
         scheduledUnits = units
-        let newDuration = date.timeIntervalSince(startTime)
+
+        // Guard against negative duration if clock has changed
+        let newDuration = max(0, date.timeIntervalSince(startTime))
 
         switch doseType {
         case .bolus:

diff --git a/Dependencies/OmniKit/OmniKit/OmnipodCommon/Pod.swift b/Dependencies/OmniKit/OmniKit/OmnipodCommon/Pod.swift
@@ -95,7 +95,7 @@ public struct Pod {
     public static let defaultLowReservoirReminder: Double = 10
 
     // Allowed Low Reservoir reminder values
-    public static let allowedLowReservoirReminderValues = Array(stride(from: 10, through: 50, by: 1))
+    public static let allowedLowReservoirReminderValues = Array(stride(from: 1, through: 50, by: 1))
 }
 
 // DeliveryStatus used in StatusResponse and DetailedStatus

diff --git a/Dependencies/OmniKit/OmniKit/OmnipodCommon/UnfinalizedDose.swift b/Dependencies/OmniKit/OmniKit/OmnipodCommon/UnfinalizedDose.swift
@@ -147,7 +147,9 @@ public struct UnfinalizedDose: RawRepresentable, Equatable, CustomStringConverti
         }
 
         scheduledUnits = units
-        let newDuration = date.timeIntervalSince(startTime)
+
+        // Guard against negative duration if clock has changed
+        let newDuration = max(0, date.timeIntervalSince(startTime))
 
         switch doseType {
         case .bolus: