From 0d679fa07e2405d1893804b38aba6f74eaeb731d Mon Sep 17 00:00:00 2001 From: marionbarker Date: Sun, 3 May 2026 12:57:05 -0700 Subject: [PATCH 1/2] support use of OmnipodKit; * when OmniBLE or OmniKit was used to start pod, this code allows OmnipodKit to control pod, * this is a one-way trip from OmniXXX to OmnipodKit for that pod --- Loop/Managers/DeviceDataManager.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index e928c5e2d0..c0e2e856e9 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -535,6 +535,12 @@ final class DeviceDataManager { return nil } + // ensure the OmnipodKit Pump manager captures pod information + let OmniStr = "Omni" + if managerIdentifier.hasPrefix(OmniStr) { + return pumpManagerTypeByIdentifier(OmniStr) + } + return pumpManagerTypeByIdentifier(managerIdentifier) } From ca7a4b25b977343b78f50493c1cda1cf8892c530 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Wed, 6 May 2026 09:29:08 -0700 Subject: [PATCH 2/2] continue OmniBLE, OmniKit pump managers if present, otherwise automatically transfer pod to OmnipodKit --- Loop/Managers/DeviceDataManager.swift | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index c0e2e856e9..ff678a8824 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -535,13 +535,18 @@ final class DeviceDataManager { return nil } - // ensure the OmnipodKit Pump manager captures pod information + if let pumpManager = pumpManagerTypeByIdentifier(managerIdentifier) { + return pumpManager + } + + /// The pumpManager was not found for managerIdentifier. If this was for an "Omnipod" (OmniKit) or + /// "Omnipod-DASH" (OmniBLE), have the universal "Omni" pumpManager (OmnipodKit) handle instead. let OmniStr = "Omni" if managerIdentifier.hasPrefix(OmniStr) { return pumpManagerTypeByIdentifier(OmniStr) } - return pumpManagerTypeByIdentifier(managerIdentifier) + return nil } func pumpManagerFromRawValue(_ rawValue: [String: Any]) -> PumpManagerUI? {