Tidepool sync 2026-05-11

MinimedKit.xcodeproj/project.pbxproj

@@ -285,7 +285,6 @@
 		C1E34B7D29C7B075009A50A5 /* RileyLinkKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E34B7C29C7B075009A50A5 /* RileyLinkKit.framework */; };
 		C1E34B8129C7B155009A50A5 /* PumpOpsSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E34B8029C7B155009A50A5 /* PumpOpsSession.swift */; };
 		C1E34B8329C7B1AB009A50A5 /* TimeZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E34B8229C7B1AB009A50A5 /* TimeZone.swift */; };
-		C1E34B8529C7B1D4009A50A5 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E34B8429C7B1D4009A50A5 /* HKUnit.swift */; };
 		C1E34B8829C7B292009A50A5 /* Comparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E34B8729C7B292009A50A5 /* Comparable.swift */; };
 		C1E34B8A29C7B2FC009A50A5 /* LocalisedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E34B8929C7B2FC009A50A5 /* LocalisedString.swift */; };
 		C1E34B8C29C7B334009A50A5 /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E34B8B29C7B334009A50A5 /* IdentifiableClass.swift */; };
@@ -632,7 +631,6 @@
 		C1E34B7C29C7B075009A50A5 /* RileyLinkKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RileyLinkKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C1E34B8029C7B155009A50A5 /* PumpOpsSession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PumpOpsSession.swift; sourceTree = "<group>"; };
 		C1E34B8229C7B1AB009A50A5 /* TimeZone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeZone.swift; sourceTree = "<group>"; };
-		C1E34B8429C7B1D4009A50A5 /* HKUnit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HKUnit.swift; sourceTree = "<group>"; };
 		C1E34B8729C7B292009A50A5 /* Comparable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comparable.swift; sourceTree = "<group>"; };
 		C1E34B8929C7B2FC009A50A5 /* LocalisedString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalisedString.swift; sourceTree = "<group>"; };
 		C1E34B8B29C7B334009A50A5 /* IdentifiableClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = "<group>"; };
@@ -1084,7 +1082,6 @@
 				C1E34B7829C7AFF7009A50A5 /* TimeInterval.swift */,
 				C1E34B7A29C7B044009A50A5 /* OSLog.swift */,
 				C1E34B8229C7B1AB009A50A5 /* TimeZone.swift */,
-				C1E34B8429C7B1D4009A50A5 /* HKUnit.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1521,7 +1518,6 @@
 				C1E34AC329C7A98F009A50A5 /* DataFrameMessageBody.swift in Sources */,
 				C1E34A7629C7A98F009A50A5 /* ChangeSensorRateOfChangeAlertSetupPumpEvent.swift in Sources */,
 				C1E34AA929C7A98F009A50A5 /* MySentryAlertType.swift in Sources */,
-				C1E34B8529C7B1D4009A50A5 /* HKUnit.swift in Sources */,
 				C1E34ABC29C7A98F009A50A5 /* ChangeMaxBolusMessageBody.swift in Sources */,
 				C1E34A4229C7A98F009A50A5 /* PumpSettings.swift in Sources */,
 				C1E34AA129C7A98F009A50A5 /* DeviceLinkMessageBody.swift in Sources */,
@@ -1830,7 +1826,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				LOCALIZED_STRING_MACRO_NAMES = (
 					NSLocalizedString,
@@ -1894,7 +1890,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				LOCALIZED_STRING_MACRO_NAMES = (
 					NSLocalizedString,

MinimedKit/CGMManager/MySentryPumpStatusMessageBody+CGMManager.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2016 Nathan Racklyeft. All rights reserved.
 //
 
-import HealthKit
+import LoopAlgorithm
 import LoopKit
 
 
@@ -39,7 +39,7 @@ extension MySentryPumpStatusMessageBody: GlucoseDisplayable {
         }
     }
 
-    public var trendRate: HKQuantity? {
+    public var trendRate: LoopQuantity? {
         return nil
     }
 

MinimedKit/PumpManager/DoseStore.swift

@@ -42,7 +42,7 @@ extension Collection where Element == TimestampedHistoryEvent {
                 if !bolus.wasRemotelyTriggered {
                     automatic = false
                 }
-                dose = DoseEntry(type: .bolus, startDate: event.date, endDate: bolusEndDate, value: bolus.programmed, unit: .units, deliveredUnits: bolus.amount, automatic: automatic, isMutable: bolus.isMutable(atDate: now, forPump: model), wasProgrammedByPumpUI: !bolus.wasRemotelyTriggered)
+                dose = DoseEntry(type: .bolus, startDate: event.date, endDate: bolusEndDate, value: bolus.programmed, unit: .units, decisionId: nil, deliveredUnits: bolus.amount, automatic: automatic, isMutable: bolus.isMutable(atDate: now, forPump: model), wasProgrammedByPumpUI: !bolus.wasRemotelyTriggered)
             case let suspendEvent as SuspendPumpEvent:
                 title = LocalizedString("Suspend", comment: "Event title for suspend")
                 dose = DoseEntry(suspendDate: event.date, wasProgrammedByPumpUI: !suspendEvent.wasRemotelyTriggered)
@@ -52,7 +52,7 @@ extension Collection where Element == TimestampedHistoryEvent {
                 dose = DoseEntry(resumeDate: event.date, wasProgrammedByPumpUI: !resumeEvent.wasRemotelyTriggered)
             case let temp as TempBasalPumpEvent:
                 if case .Absolute = temp.rateType {
-                    lastTempBasal = DoseEntry(type: .tempBasal, startDate: event.date, value: temp.rate, unit: .unitsPerHour, isMutable: false, wasProgrammedByPumpUI: !temp.wasRemotelyTriggered)
+                    lastTempBasal = DoseEntry(type: .tempBasal, startDate: event.date, value: temp.rate, unit: .unitsPerHour, decisionId: nil, isMutable: false, wasProgrammedByPumpUI: !temp.wasRemotelyTriggered)
                     continue
                 } else {
                     title = LocalizedString("Percent Temp Basal", comment: "Event title for percent based temp basal")
@@ -78,6 +78,7 @@ extension Collection where Element == TimestampedHistoryEvent {
                         endDate: endDate,
                         value: lastTemp.unitsPerHour,
                         unit: .unitsPerHour,
+                        decisionId: nil,
                         automatic: false, // If this was automatic dose, it should be set as such during reconciliation
                         isMutable: isMutable,
                         wasProgrammedByPumpUI: lastTemp.wasProgrammedByPumpUI
@@ -92,6 +93,7 @@ extension Collection where Element == TimestampedHistoryEvent {
                     endDate: event.date.addingTimeInterval(.hours(24)),
                     value: basal.scheduleEntry.rate,
                     unit: .unitsPerHour,
+                    decisionId: nil,
                     isMutable: false
                 )
             case is RewindPumpEvent:

MinimedKit/PumpManager/EnliteSensorDisplayable.swift

@@ -7,14 +7,13 @@
 //
 
 import Foundation
-import HealthKit
 import LoopKit
-
+import LoopAlgorithm
 
 struct EnliteSensorDisplayable: Equatable, GlucoseDisplayable {
     public let isStateValid: Bool
     public let trendType: LoopKit.GlucoseTrend?
-    public let trendRate: HKQuantity?
+    public let trendRate: LoopQuantity?
     public let isLocal: Bool
 
     // TODO Placeholder. This functionality will come with LOOP-1311
@@ -50,7 +49,7 @@ extension MinimedKit.RelativeTimestampedGlucoseEvent {
         return nil
     }
 
-    var trendRate: HKQuantity? {
+    var trendRate: LoopQuantity? {
         return nil
     }