Tidepool sync 2026-05-11

NightscoutService.xcodeproj/project.pbxproj

@@ -15,7 +15,6 @@
 		A90E39A122BC773A0016DFE8 /* NightscoutUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90E39A022BC773A0016DFE8 /* NightscoutUploader.swift */; };
 		A90E39A322BC782C0016DFE8 /* SyncCarbObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90E39A222BC782C0016DFE8 /* SyncCarbObject.swift */; };
 		A90E39A522BC791E0016DFE8 /* DoseEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90E39A422BC791E0016DFE8 /* DoseEntry.swift */; };
-		A90E39A722BC7A360016DFE8 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90E39A622BC7A360016DFE8 /* HKUnit.swift */; };
 		A90E39A922BC7AD10016DFE8 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90E39A822BC7AD10016DFE8 /* Bundle.swift */; };
 		A91BAC2522BC691A00ABF1BB /* NightscoutServiceKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A91BAC1B22BC691A00ABF1BB /* NightscoutServiceKit.framework */; };
 		A91BAC2C22BC691A00ABF1BB /* NightscoutServiceKit.h in Headers */ = {isa = PBXBuildFile; fileRef = A91BAC1E22BC691A00ABF1BB /* NightscoutServiceKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -145,7 +144,6 @@
 		A90E39A022BC773A0016DFE8 /* NightscoutUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightscoutUploader.swift; sourceTree = "<group>"; };
 		A90E39A222BC782C0016DFE8 /* SyncCarbObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncCarbObject.swift; sourceTree = "<group>"; };
 		A90E39A422BC791E0016DFE8 /* DoseEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DoseEntry.swift; sourceTree = "<group>"; };
-		A90E39A622BC7A360016DFE8 /* HKUnit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HKUnit.swift; sourceTree = "<group>"; };
 		A90E39A822BC7AD10016DFE8 /* Bundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = "<group>"; };
 		A91BAC1B22BC691A00ABF1BB /* NightscoutServiceKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NightscoutServiceKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A91BAC1E22BC691A00ABF1BB /* NightscoutServiceKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NightscoutServiceKit.h; sourceTree = "<group>"; };
@@ -259,7 +257,6 @@
 			isa = PBXGroup;
 			children = (
 				A90E39A422BC791E0016DFE8 /* DoseEntry.swift */,
-				A90E39A622BC7A360016DFE8 /* HKUnit.swift */,
 				A90E39A022BC773A0016DFE8 /* NightscoutUploader.swift */,
 				C1F7822727CD57A100C0919A /* OverrideTreament.swift */,
 				C177C4512ABE2D8900911B56 /* PersistedCgmEvent.swift */,
@@ -729,7 +726,6 @@
 				A941B08929BCB99C00F91340 /* RemoteCommandValidator.swift in Sources */,
 				C1398D2027C41E3D00416AD6 /* ProfileSet.swift in Sources */,
 				A9AA6E6329EB07D7008FFA78 /* Action.swift in Sources */,
-				A90E39A722BC7A360016DFE8 /* HKUnit.swift in Sources */,
 				A99A115E29AA28EE007919CE /* RemoteCommandSourceV1.swift in Sources */,
 				A9246B2526231B3A00CCDCB3 /* OTPManager.swift in Sources */,
 				A90E399E22BC76DB0016DFE8 /* TimeInterval.swift in Sources */,
@@ -919,7 +915,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				LOCALIZED_STRING_MACRO_NAMES = (
 					NSLocalizedString,
@@ -1025,7 +1021,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				LOCALIZED_STRING_MACRO_NAMES = (
 					NSLocalizedString,

NightscoutServiceKit/Extensions/OverrideTreament.swift

@@ -7,15 +7,15 @@
 //
 
 import Foundation
-import NightscoutKit
+import LoopAlgorithm
 import LoopKit
-import HealthKit
+import NightscoutKit
 
 extension OverrideTreatment {
     convenience init(override: LoopKit.TemporaryScheduleOverride) {
 
         // NS Treatments should be in mg/dL
-        let unit: HKUnit = .milligramsPerDeciliter
+        let unit: LoopUnit = .milligramsPerDeciliter
 
         let nsTargetRange: ClosedRange<Double>?
         if let targetRange = override.settings.targetRange {
@@ -30,12 +30,16 @@ extension OverrideTreatment {
         switch override.context {
         case .custom:
             reason = NSLocalizedString("Custom Override", comment: "Name of custom override")
-        case .legacyWorkout:
-            reason = NSLocalizedString("Workout", comment: "Name of legacy workout override")
+        case .activity(let activity):
+            reason = activity.activityType.name + NSLocalizedString("Activity", comment: "Suffix added to the name of an activity override")
         case .preMeal:
-            reason = NSLocalizedString("Pre-Meal", comment: "Name of pre-meal workout override")
+            reason = NSLocalizedString("Pre-Meal", comment: "Name of pre-meal override")
         case .preset(let preset):
-            reason = preset.symbol + " " + preset.name
+            if let symbol = preset.symbol, symbol.symbolType == .emoji {
+                reason = symbol.value + " " + preset.name
+            } else {
+                reason = preset.name
+            }
         }
 
         let remoteAddress: String?

NightscoutServiceKit/Extensions/ProfileSet.swift

@@ -7,22 +7,22 @@
 //
 
 import Foundation
-import NightscoutKit
+import LoopAlgorithm
 import LoopKit
-import HealthKit
+import NightscoutKit
 
-private extension HKUnit {
-    static func glucoseUnitFromNightscoutUnitString(_ unitString: String) -> HKUnit? {
+private extension LoopUnit {
+    static func glucoseUnitFromNightscoutUnitString(_ unitString: String) -> LoopUnit? {
         // Some versions of Loop incorrectly uploaded units with
         // special characters to avoid line breaking.
-        if unitString == HKUnit.millimolesPerLiter.shortLocalizedUnitString() ||
-            unitString == HKUnit.millimolesPerLiter.shortLocalizedUnitString(avoidLineBreaking: false)
+        if unitString == LoopUnit.millimolesPerLiter.shortLocalizedUnitString() ||
+            unitString == LoopUnit.millimolesPerLiter.shortLocalizedUnitString(avoidLineBreaking: false)
         {
             return .millimolesPerLiter
         }
 
-        if unitString == HKUnit.milligramsPerDeciliter.shortLocalizedUnitString() ||
-            unitString == HKUnit.milligramsPerDeciliter.shortLocalizedUnitString(avoidLineBreaking: false)
+        if unitString == LoopUnit.milligramsPerDeciliter.shortLocalizedUnitString() ||
+            unitString == LoopUnit.milligramsPerDeciliter.shortLocalizedUnitString(avoidLineBreaking: false)
         {
             return .milligramsPerDeciliter
         }
@@ -36,14 +36,14 @@ extension ProfileSet {
 
         guard let profile = store["Default"],
               let glucoseSafetyLimit = settings.minimumBGGuard,
-              let settingsGlucoseUnit = HKUnit.glucoseUnitFromNightscoutUnitString(units)
+              let settingsGlucoseUnit = LoopUnit.glucoseUnitFromNightscoutUnitString(units)
         else {
             return nil
         }
 
         // If units are specified on the schedule, prefer those over the units specified on the ProfileSet
-        let scheduleGlucoseUnit: HKUnit
-        if let profileUnitString = profile.units, let profileUnit = HKUnit.glucoseUnitFromNightscoutUnitString(profileUnitString)
+        let scheduleGlucoseUnit: LoopUnit
+        if let profileUnitString = profile.units, let profileUnit = LoopUnit.glucoseUnitFromNightscoutUnitString(profileUnitString)
         {
             scheduleGlucoseUnit = profileUnit
         } else {
@@ -59,8 +59,7 @@ extension ProfileSet {
         let correctionRangeOverrides: CorrectionRangeOverrides?
         if let range = settings.preMealTargetRange {
             correctionRangeOverrides = CorrectionRangeOverrides(
-                preMeal: GlucoseRange(minValue: range.lowerBound, maxValue: range.upperBound, unit: settingsGlucoseUnit),
-                workout: nil // No longer used
+                preMeal: GlucoseRange(minValue: range.lowerBound, maxValue: range.upperBound, unit: settingsGlucoseUnit)
             )
         } else {
             correctionRangeOverrides = nil
@@ -76,7 +75,7 @@ extension ProfileSet {
             timeZone: profile.timeZone)
 
         let carbSchedule = CarbRatioSchedule(
-            unit: .gram(),
+            unit: .gram,
             dailyItems: profile.carbratio.map { RepeatingScheduleValue(startTime: $0.offset, value: $0.value) },
             timeZone: profile.timeZone)
 
@@ -98,7 +97,7 @@ extension ProfileSet {
 
 extension NightscoutKit.TemporaryScheduleOverride  {
 
-    func loopOverride(for unit: HKUnit) -> LoopKit.TemporaryScheduleOverridePreset? {
+    func loopOverride(for unit: LoopUnit) -> LoopKit.TemporaryPreset? {
         guard let name = name,
             let symbol = symbol
         else {
@@ -114,7 +113,7 @@ extension NightscoutKit.TemporaryScheduleOverride  {
             target = nil
         }
 
-        let temporaryOverrideSettings = TemporaryScheduleOverrideSettings(
+        let temporaryOverrideSettings = TemporaryPresetSettings(
             unit: unit,
             targetRange: target,
             insulinNeedsScaleFactor: insulinNeedsScaleFactor)
@@ -127,8 +126,8 @@ extension NightscoutKit.TemporaryScheduleOverride  {
             loopDuration = .finite(duration)
         }
 
-        return TemporaryScheduleOverridePreset(
-            symbol: symbol,
+        return TemporaryPreset(
+            symbol: .emoji(symbol),
             name: name,
             settings: temporaryOverrideSettings,
             duration: loopDuration)

NightscoutServiceKit/Extensions/StoredDosingDecision.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import HealthKit
+import LoopAlgorithm
 import LoopKit
 import NightscoutKit
 
@@ -24,28 +24,25 @@ extension StoredDosingDecision {
         guard let carbsOnBoard = carbsOnBoard else {
             return nil
         }
-        return COBStatus(cob: carbsOnBoard.quantity.doubleValue(for: HKUnit.gram()), timestamp: carbsOnBoard.startDate)
+        return COBStatus(cob: carbsOnBoard.quantity.doubleValue(for: LoopUnit.gram), timestamp: carbsOnBoard.startDate)
     }
 
     var loopStatusPredicted: PredictedBG? {
         guard let predictedGlucose = predictedGlucose, let startDate = predictedGlucose.first?.startDate else {
             return nil
         }
-        return PredictedBG(startDate: startDate, values: predictedGlucose.map { $0.quantity })
+        return PredictedBG(startDate: startDate, values: predictedGlucose.map { $0.quantity.hkQuantity })
     }
 
     var loopStatusAutomaticDoseRecommendation: NightscoutKit.AutomaticDoseRecommendation? {
         guard let automaticDoseRecommendation = automaticDoseRecommendation else {
             return nil
         }
 
-        let nightscoutTempBasalAdjustment: TempBasalAdjustment?
-
-        if let basalAdjustment = automaticDoseRecommendation.basalAdjustment {
-            nightscoutTempBasalAdjustment = TempBasalAdjustment(rate: basalAdjustment.unitsPerHour, duration: basalAdjustment.duration)
-        } else {
-            nightscoutTempBasalAdjustment = nil
-        }
+        let nightscoutTempBasalAdjustment = TempBasalAdjustment(
+            rate: automaticDoseRecommendation.basalAdjustment.unitsPerHour,
+            duration: automaticDoseRecommendation.basalAdjustment.duration
+        )
 
         return NightscoutKit.AutomaticDoseRecommendation(
             timestamp: date,
@@ -61,12 +58,17 @@ extension StoredDosingDecision {
     }
 
     var loopStatusEnacted: LoopEnacted? {
-        guard let automaticDoseRecommendation = automaticDoseRecommendation, errors.isEmpty else {
+        guard errors.isEmpty else {
             return nil
         }
-        let tempBasal = automaticDoseRecommendation.basalAdjustment
         // NS needs to be updated to support an "enacted" field with no rate. Once that happens, we should not report a fake cancel here, and rate/duration should be nil instead of 0
-        return LoopEnacted(rate: tempBasal?.unitsPerHour ?? 0, duration: tempBasal?.duration ?? 0, timestamp: date, received: true, bolusVolume: automaticDoseRecommendation.bolusUnits ?? 0)
+        return LoopEnacted(
+            rate: enactedTempBasal?.unitsPerHour ?? 0,
+            duration: enactedTempBasal?.duration ?? 0,
+            timestamp: date,
+            received: true,
+            bolusVolume: enactedBolusAmount ?? 0
+        )
     }
 
     var loopStatusFailureReason: String? {
@@ -122,10 +124,10 @@ extension StoredDosingDecision {
             return NightscoutKit.OverrideStatus(timestamp: date, active: false)
         }
 
-        let unit = glucoseTargetRangeSchedule?.unit ?? HKUnit.milligramsPerDeciliter
-        let lowerTarget = HKQuantity(unit: unit, doubleValue: glucoseTargetRange.minValue)
-        let upperTarget = HKQuantity(unit: unit, doubleValue: glucoseTargetRange.maxValue)
-        let currentCorrectionRange = CorrectionRange(minValue: lowerTarget, maxValue: upperTarget)
+        let unit = glucoseTargetRangeSchedule?.unit ?? LoopUnit.milligramsPerDeciliter
+        let lowerTarget = LoopQuantity(unit: unit, doubleValue: glucoseTargetRange.minValue)
+        let upperTarget = LoopQuantity(unit: unit, doubleValue: glucoseTargetRange.maxValue)
+        let currentCorrectionRange = CorrectionRange(minValue: lowerTarget.hkQuantity, maxValue: upperTarget.hkQuantity)
         let duration = scheduleOverride.duration != .indefinite ? round(scheduleOverride.actualEndDate.timeIntervalSince(date)): nil
 
         return NightscoutKit.OverrideStatus(name: scheduleOverride.context.name,

NightscoutServiceKit/Extensions/StoredSettings.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2019 LoopKit Authors. All rights reserved.
 //
 
-import HealthKit
 import LoopKit
 import NightscoutKit
 
@@ -49,8 +48,8 @@ extension StoredSettings {
 
         return NightscoutKit.LoopSettings(
             dosingEnabled: dosingEnabled,
-            overridePresets: overridePresets?.map { $0.nsScheduleOverride(for: bloodGlucoseUnit) } ?? [],
-            scheduleOverride: scheduleOverride?.nsScheduleOverride(for: bloodGlucoseUnit),
+            overridePresets: overridePresets.map { $0.nsScheduleOverride(for: bloodGlucoseUnit) },
+            scheduleOverride: nil,
             minimumBGGuard: suspendThreshold?.quantity.doubleValue(for: bloodGlucoseUnit),
             preMealTargetRange: nightscoutPreMealTargetRange,
             maximumBasalRatePerHour: maximumBasalRatePerHour,

NightscoutServiceKit/Extensions/SyncCarbObject.swift

@@ -9,7 +9,6 @@
 import Foundation
 import LoopKit
 import NightscoutKit
-import HealthKit
 
 extension SyncCarbObject {
 

NightscoutServiceKit/Extensions/TemporaryScheduleOverride.swift

@@ -6,13 +6,13 @@
 //  Copyright © 2019 LoopKit Authors. All rights reserved.
 //
 
-import HealthKit
+import LoopAlgorithm
 import LoopKit
 import NightscoutKit
 
 extension LoopKit.TemporaryScheduleOverride {
 
-    func nsScheduleOverride(for unit: HKUnit) -> NightscoutKit.TemporaryScheduleOverride {
+    func nsScheduleOverride(for unit: LoopUnit) -> NightscoutKit.TemporaryScheduleOverride {
         let nsTargetRange: ClosedRange<Double>?
         if let targetRange = settings.targetRange {
             nsTargetRange = ClosedRange(uncheckedBounds: (
@@ -34,7 +34,7 @@ extension LoopKit.TemporaryScheduleOverride {
             duration: nsDuration,
             targetRange: nsTargetRange,
             insulinNeedsScaleFactor: settings.insulinNeedsScaleFactor,
-            symbol: context.symbol,
+            symbol: context.symbol?.textualRepresentation,
             name: context.name)
     }
 
@@ -46,29 +46,31 @@ extension LoopKit.TemporaryScheduleOverride.Context {
         switch self {
         case .custom:
             return nil
-        case .legacyWorkout:
-            return LocalizedString("Workout", comment: "Name uploaded to Nightscout for legacy workout override")
+        case .activity(let activity):
+            return activity.preset.name
         case .preMeal:
             return LocalizedString("Pre-Meal", comment: "Name uploaded to Nightscout for Pre-Meal override")
         case .preset(let preset):
             return preset.name
         }
     }
 
-    var symbol: String? {
+    var symbol: PresetSymbol? {
         switch self {
         case .preset(let preset):
             return preset.symbol
+        case .activity(let activity):
+            return activity.preset.symbol
         default:
             return nil
         }
     }
 
 }
 
-extension LoopKit.TemporaryScheduleOverridePreset {
+extension LoopKit.TemporaryPreset {
 
-    func nsScheduleOverride(for unit: HKUnit) -> NightscoutKit.TemporaryScheduleOverride {
+    func nsScheduleOverride(for unit: LoopUnit) -> NightscoutKit.TemporaryScheduleOverride {
         let nsTargetRange: ClosedRange<Double>?
         if let targetRange = settings.targetRange {
             nsTargetRange = ClosedRange(uncheckedBounds: (
@@ -90,8 +92,9 @@ extension LoopKit.TemporaryScheduleOverridePreset {
             duration: nsDuration,
             targetRange: nsTargetRange,
             insulinNeedsScaleFactor: settings.insulinNeedsScaleFactor,
-            symbol: self.symbol,
-            name: self.name)
+            symbol: self.symbol?.textualRepresentation,
+            name: self.name
+        )
     }
 
 }