Merge branch 'LoopKit:dev' into dev

Trpl7ca · Feb 15, 2024 · 156252a · 156252a
2 parents a3139bd + b58fb45
commit 156252a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/LoopKit b/LoopKit
diff --git a/OmniBLE b/OmniBLE
diff --git a/OmniKit b/OmniKit
+1 −1		OmniBLE/OmnipodCommon/Pod.swift
+3 −0		OmniBLE/PumpManager/OmniBLEPumpManager.swift
+7 −7		OmniBLE/PumpManagerUI/ViewControllers/DashUICoordinator.swift
+9 −1		OmniBLE/PumpManagerUI/ViewModels/DeactivatePodViewModel.swift
+0 −3		OmniBLE/PumpManagerUI/Views/AttachPodView.swift
+0 −3		OmniBLE/PumpManagerUI/Views/CheckInsertedCannulaView.swift
+29 −9		OmniBLE/PumpManagerUI/Views/DeactivatePodView.swift
+9 −2		OmniBLE/PumpManagerUI/Views/DeliveryUncertaintyRecoveryView.swift
+0 −5		OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift
+0 −3		OmniBLE/PumpManagerUI/Views/PairPodView.swift
+0 −3		OmniBLE/PumpManagerUI/Views/SetupCompleteView.swift
+25 −25		OmniKit.xcodeproj/project.pbxproj
+4 −4		OmniKit/OmnipodCommon/BasalDeliveryTable.swift
+6 −2		OmniKit/OmnipodCommon/MessageBlocks/ConfigureAlertsCommand.swift
+7 −7		OmniKit/OmnipodCommon/MessageBlocks/DetailedStatus.swift
+5 −5		OmniKit/OmnipodCommon/MessageBlocks/PodInfo.swift
+29 −18		OmniKit/OmnipodCommon/MessageBlocks/PodInfoActivationTime.swift
+0 −55		OmniKit/OmnipodCommon/MessageBlocks/PodInfoConfiguredAlerts.swift
+4 −4		OmniKit/OmnipodCommon/MessageBlocks/PodInfoPulseLog.swift
+15 −2		OmniKit/OmnipodCommon/MessageBlocks/PodInfoPulseLogPlus.swift
+69 −0		OmniKit/OmnipodCommon/MessageBlocks/PodInfoTriggeredAlerts.swift
+1 −1		OmniKit/OmnipodCommon/MessageBlocks/SetInsulinScheduleCommand.swift
+5 −1		OmniKit/OmnipodCommon/Pod.swift
+39 −9		OmniKit/PumpManager/OmnipodPumpManager.swift
+36 −7		OmniKit/PumpManager/PodCommsSession.swift
+20 −3		OmniKit/PumpManager/PodState.swift
+7 −3		OmniKitTests/PodCommsSessionTests.swift
+29 −47		OmniKitTests/PodInfoTests.swift
+3 −3		OmniKitTests/StatusTests.swift
+16 −0		OmniKitUI/Resources/OmniKitUI.xcassets/pod_reservoir_mask_swiftui.imageset/Contents.json
+55 −0		OmniKitUI/Resources/OmniKitUI.xcassets/pod_reservoir_mask_swiftui.imageset/pod_reservoir_mask.svg
+15 −0		OmniKitUI/Resources/OmniKitUI.xcassets/pod_reservoir_swiftui.imageset/Contents.json
+59 −0		OmniKitUI/Resources/OmniKitUI.xcassets/pod_reservoir_swiftui.imageset/pod_reservoir.svg
+9 −8		OmniKitUI/ViewControllers/OmnipodUICoordinator.swift
+9 −1		OmniKitUI/ViewModels/DeactivatePodViewModel.swift
+29 −9		OmniKitUI/Views/DeactivatePodView.swift
+9 −2		OmniKitUI/Views/DeliveryUncertaintyRecoveryView.swift