Omnipod Integration

Cartfile

@@ -1,8 +1,7 @@
-github "LoopKit/LoopKit" "dev"
-github "LoopKit/CGMBLEKit" "dev"
-github "LoopKit/dexcom-share-client-swift" "dev"
-github "LoopKit/G4ShareSpy" "dev"
-github "ps2/rileylink_ios" "dev"
+github "LoopKit/LoopKit" "omnipod-testing"
+github "LoopKit/CGMBLEKit" "omnipod-testing"
 github "i-schuetz/SwiftCharts" == 0.6.5
+github "LoopKit/dexcom-share-client-swift" "omnipod-testing"
+github "LoopKit/G4ShareSpy" "omnipod-testing"
+github "ps2/rileylink_ios" "omnipod-testing"
 github "LoopKit/Amplitude-iOS" "decreepify"
-github "maxkonovalov/MKRingProgressView" ~> 2.2

Cartfile.resolved

@@ -1,8 +1,8 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "ea1267791c66e884f1013fffd36faf4555cc6eaf"
-github "LoopKit/G4ShareSpy" "fed5a389e3e47e3a1953878dd21852aa5f44b360"
-github "LoopKit/LoopKit" "e386a24577244ee6b2add52e8b2aff0385c2200b"
-github "LoopKit/dexcom-share-client-swift" "b0419edf55c7f389b36cb47dd5c376bbd3d03d69"
+github "LoopKit/CGMBLEKit" "76c14b44fd40421c6238a9e00cb5ca66b50dbc2e"
+github "LoopKit/G4ShareSpy" "af2a6dd2f8a468d3864f3c6cd27519a7b694cc04"
+github "LoopKit/LoopKit" "ca1123d01bcad6061fcaf26a0ffe72829f234e65"
+github "LoopKit/dexcom-share-client-swift" "3eb7e2c08335a9ad5bafb9b1e0fad1eab7e53f65"
 github "i-schuetz/SwiftCharts" "0.6.5"
-github "maxkonovalov/MKRingProgressView" "2.2.1"
-github "ps2/rileylink_ios" "e0dc72050510fb8bf7fc85f655b8d24dc4de0097"
+github "maxkonovalov/MKRingProgressView" "2.2.2"
+github "ps2/rileylink_ios" "f1577d71371202c2ae1e6a240473946f603caa06"

Common/Models/PumpManager.swift

@@ -8,10 +8,12 @@
 import Foundation
 import LoopKit
 import MinimedKit
+import OmniKit
 import MockKit
 
 
 let allPumpManagers: [PumpManager.Type] = [
+    OmnipodPumpManager.self,
     MinimedPumpManager.self,
     MockPumpManager.self,
 ]

Loop.xcodeproj/project.pbxproj

@@ -337,6 +337,8 @@
 		898ECA69218ABDA9001E9D35 /* CLKTextProvider+Compound.m in Sources */ = {isa = PBXBuildFile; fileRef = 898ECA67218ABDA8001E9D35 /* CLKTextProvider+Compound.m */; };
 		C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
 		C10B28461EA9BA5E006EA1FC /* far_future_high_bg_forecast.json in Resources */ = {isa = PBXBuildFile; fileRef = C10B28451EA9BA5E006EA1FC /* far_future_high_bg_forecast.json */; };
+		C110A0E7221BC2400016560B /* OmniKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1BF220D675700689850 /* OmniKit.framework */; };
+		C110A0E8221BC2430016560B /* OmniKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1C0220D675700689850 /* OmniKitUI.framework */; };
 		C11C87DE1E21EAAD00BB71D3 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
 		C12F21A71DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = C12F21A61DFA79CB00748193 /* recommend_temp_basal_very_low_end_in_range.json */; };
 		C13255D6223E7BE2008AF50C /* BolusProgressTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C1F8B1DB223862D500DD66CF /* BolusProgressTableViewCell.xib */; };
@@ -354,6 +356,8 @@
 		C1C0BE2A224C0FA000C03B4D /* SwiftCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4346D1EF1C781BEA00ABAFE3 /* SwiftCharts.framework */; };
 		C1C6591C1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json in Resources */ = {isa = PBXBuildFile; fileRef = C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */; };
 		C1C73F0D1DE3D0270022FC89 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C1C73F0F1DE3D0270022FC89 /* InfoPlist.strings */; };
+		C1C7F1C1220D675800689850 /* OmniKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1BF220D675700689850 /* OmniKit.framework */; };
+		C1C7F1C2220D675800689850 /* OmniKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1C7F1C0220D675700689850 /* OmniKitUI.framework */; };
 		C1E2773E224177C000354103 /* ClockKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2773D224177C000354103 /* ClockKit.framework */; };
 		C1E2774822433D7A00354103 /* MKRingProgressView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1E2774722433D7A00354103 /* MKRingProgressView.framework */; };
 		C1F8B243223E73FD00DD66CF /* BolusProgressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */; };
@@ -483,6 +487,13 @@
 			remoteGlobalIDString = 4F75288A1DFE1DC600C322D6;
 			remoteInfo = LoopUI;
 		};
+		C110A0E9221BC29B0016560B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 43776F841B8022E90074EA36 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 432CF87720D8B8380066B889;
+			remoteInfo = Cartfile;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -999,6 +1010,8 @@
 		C18C8C501D5A351900E043FB /* NightscoutDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutDataManager.swift; sourceTree = "<group>"; };
 		C1C108C22152F46D00EA5165 /* CGMBLEKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CGMBLEKitUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C1C6591B1E1B1FDA0025CC58 /* recommend_temp_basal_dropping_then_rising.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_dropping_then_rising.json; sourceTree = "<group>"; };
+		C1C7F1BF220D675700689850 /* OmniKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OmniKit.framework; path = Carthage/Build/iOS/OmniKit.framework; sourceTree = "<group>"; };
+		C1C7F1C0220D675700689850 /* OmniKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OmniKitUI.framework; path = Carthage/Build/iOS/OmniKitUI.framework; sourceTree = "<group>"; };
 		C1E2773D224177C000354103 /* ClockKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ClockKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS5.1.sdk/System/Library/Frameworks/ClockKit.framework; sourceTree = DEVELOPER_DIR; };
 		C1E2774722433D7A00354103 /* MKRingProgressView.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MKRingProgressView.framework; path = Carthage/Build/iOS/MKRingProgressView.framework; sourceTree = "<group>"; };
 		C1F8B1D122375E4200DD66CF /* BolusProgressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BolusProgressTableViewCell.swift; sourceTree = "<group>"; };
@@ -1026,6 +1039,7 @@
 				892A5D2C222EF60A008961AB /* MockKitUI.framework in Frameworks */,
 				4F7528941DFE1E9500C322D6 /* LoopUI.framework in Frameworks */,
 				434FB6461D68F1CD007B9C70 /* Amplitude.framework in Frameworks */,
+				C1C7F1C1220D675800689850 /* OmniKit.framework in Frameworks */,
 				43A8EC6F210E622700A81379 /* CGMBLEKitUI.framework in Frameworks */,
 				438A95A81D8B9B24009D12E1 /* CGMBLEKit.framework in Frameworks */,
 				43C246A81D89990F0031F8D1 /* Crypto.framework in Frameworks */,
@@ -1035,6 +1049,7 @@
 				437AFEE7203688CF008C4892 /* LoopKitUI.framework in Frameworks */,
 				43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */,
 				43709AEA20DF3F8200F941B3 /* MinimedKitUI.framework in Frameworks */,
+				C1C7F1C2220D675800689850 /* OmniKitUI.framework in Frameworks */,
 				C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */,
 				437AFEE42035252A008C4892 /* RileyLinkBLEKit.framework in Frameworks */,
 				43523EDB1CC35083001850F1 /* RileyLinkKit.framework in Frameworks */,
@@ -1115,6 +1130,8 @@
 				C1C0BE2A224C0FA000C03B4D /* SwiftCharts.framework in Frameworks */,
 				4F7528951DFE1E9B00C322D6 /* LoopUI.framework in Frameworks */,
 				437AFEE520352591008C4892 /* NotificationCenter.framework in Frameworks */,
+				C110A0E7221BC2400016560B /* OmniKit.framework in Frameworks */,
+				C110A0E8221BC2430016560B /* OmniKitUI.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1695,6 +1712,8 @@
 		968DCD53F724DE56FFE51920 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				C1C7F1BF220D675700689850 /* OmniKit.framework */,
+				C1C7F1C0220D675700689850 /* OmniKitUI.framework */,
 				C1E2773D224177C000354103 /* ClockKit.framework */,
 				C1E2774722433D7A00354103 /* MKRingProgressView.framework */,
 				892A5D5A222F0D7C008961AB /* LoopTestingKit.framework */,
@@ -1931,6 +1950,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				C110A0EA221BC29B0016560B /* PBXTargetDependency */,
 				43D9000D21EB0BEA00AF44BF /* PBXTargetDependency */,
 				4F7528991DFE1ED800C322D6 /* PBXTargetDependency */,
 			);
@@ -2295,6 +2315,8 @@
 				"$(SRCROOT)/Carthage/Build/iOS/MinimedKitUI.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/CGMBLEKitUI.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/ShareClientUI.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/OmniKit.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/OmniKitUI.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/LoopTestingKit.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/MockKit.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/MockKitUI.framework",
@@ -2718,6 +2740,11 @@
 			target = 4F75288A1DFE1DC600C322D6 /* LoopUI */;
 			targetProxy = 4F7528981DFE1ED800C322D6 /* PBXContainerItemProxy */;
 		};
+		C110A0EA221BC29B0016560B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 432CF87720D8B8380066B889 /* Cartfile */;
+			targetProxy = C110A0E9221BC29B0016560B /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */

Loop/Managers/DeviceDataManager.swift

@@ -11,7 +11,7 @@ import LoopKit
 import LoopKitUI
 import LoopCore
 import LoopTestingKit
-
+import UserNotifications
 
 final class DeviceDataManager {
 
@@ -68,6 +68,8 @@ final class DeviceDataManager {
         }
     }
 
+    private var lastBLEDrivenUpdate = Date.distantPast
+
     private let lockedPumpManagerStatus: Locked<PumpManagerStatus?> = Locked(nil)
 
     static let batteryReplacementDetectionThreshold = 0.5
@@ -176,6 +178,29 @@ extension DeviceDataManager: RemoteDataManagerDelegate {
     }
 }
 
+// MARK: - DeviceManagerDelegate
+extension DeviceDataManager: DeviceManagerDelegate {
+    func scheduleNotification(for manager: DeviceManager,
+                              identifier: String,
+                              content: UNNotificationContent,
+                              trigger: UNNotificationTrigger?) {
+        let request = UNNotificationRequest(
+            identifier: identifier,
+            content: content,
+            trigger: trigger
+        )
+
+        DispatchQueue.main.async {
+            UNUserNotificationCenter.current().add(request)
+        }
+    }
+
+    func clearNotification(for manager: DeviceManager, identifier: String) {
+        DispatchQueue.main.async {
+            UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [identifier])
+        }
+    }
+}
 
 // MARK: - CGMManagerDelegate
 extension DeviceDataManager: CGMManagerDelegate {
@@ -243,6 +268,13 @@ extension DeviceDataManager: PumpManagerDelegate {
     func pumpManagerBLEHeartbeatDidFire(_ pumpManager: PumpManager) {
         log.default("PumpManager:\(type(of: pumpManager)) did fire BLE heartbeat")
 
+        let bleHeartbeatUpdateInterval = TimeInterval(minutes: 4.5)
+        guard lastBLEDrivenUpdate.timeIntervalSinceNow < -bleHeartbeatUpdateInterval else {
+            log.default("Skipping ble heartbeat")
+            return
+        }
+        lastBLEDrivenUpdate = Date()
+
         cgmManager?.fetchNewDataIfNeeded { (result) in
             if case .newData = result {
                 AnalyticsManager.shared.didFetchNewCGMData()

Loop/Managers/NightscoutDataManager.swift

@@ -152,14 +152,23 @@ final class NightscoutDataManager {
                 bolusing = false
             }
 
+            let currentReservoirUnits: Double?
+            if let lastReservoirValue = deviceManager.loopManager.doseStore.lastReservoirValue, lastReservoirValue.startDate > Date().addingTimeInterval(.minutes(-15)) {
+                currentReservoirUnits = lastReservoirValue.unitVolume
+            } else {
+                currentReservoirUnits = nil
+            }
+
             pumpStatus = NightscoutUploadKit.PumpStatus(
                 clock: Date(),
                 pumpID: pumpManagerStatus.device.localIdentifier ?? "Unknown",
+                manufacturer: pumpManagerStatus.device.manufacturer,
+                model: pumpManagerStatus.device.model,
                 iob: nil,
                 battery: battery,
                 suspended: pumpManagerStatus.basalDeliveryState == .suspended,
                 bolusing: bolusing,
-                reservoir: deviceManager.loopManager.doseStore.lastReservoirValue?.unitVolume,
+                reservoir: currentReservoirUnits,
                 secondsFromGMT: pumpManagerStatus.timeZone.secondsFromGMT())
         } else {
             pumpStatus = nil

Loop/Managers/NotificationManager.swift

@@ -10,15 +10,7 @@ import UIKit
 import UserNotifications
 import LoopKit
 
-
 struct NotificationManager {
-    enum Category: String {
-        case bolusFailure
-        case loopNotRunning
-        case pumpBatteryLow
-        case pumpReservoirEmpty
-        case pumpReservoirLow
-    }
 
     enum Action: String {
         case retryBolus
@@ -39,7 +31,7 @@ struct NotificationManager {
         )
 
         categories.append(UNNotificationCategory(
-            identifier: Category.bolusFailure.rawValue,
+            identifier: LoopNotificationCategory.bolusFailure.rawValue,
             actions: [retryBolusAction],
             intentIdentifiers: [],
             options: []
@@ -89,7 +81,7 @@ struct NotificationManager {
         notification.sound = UNNotificationSound.default()
 
         if startDate.timeIntervalSinceNow >= TimeInterval(minutes: -5) {
-            notification.categoryIdentifier = Category.bolusFailure.rawValue
+            notification.categoryIdentifier = LoopNotificationCategory.bolusFailure.rawValue
         }
 
         notification.userInfo = [
@@ -99,7 +91,7 @@ struct NotificationManager {
 
         let request = UNNotificationRequest(
             // Only support 1 bolus notification at once
-            identifier: Category.bolusFailure.rawValue,
+            identifier: LoopNotificationCategory.bolusFailure.rawValue,
             content: notification,
             trigger: nil
         )
@@ -131,11 +123,11 @@ struct NotificationManager {
 
             notification.title = NSLocalizedString("Loop Failure", comment: "The notification title for a loop failure")
             notification.sound = UNNotificationSound.default()
-            notification.categoryIdentifier = Category.loopNotRunning.rawValue
-            notification.threadIdentifier = Category.loopNotRunning.rawValue
+            notification.categoryIdentifier = LoopNotificationCategory.loopNotRunning.rawValue
+            notification.threadIdentifier = LoopNotificationCategory.loopNotRunning.rawValue
 
             let request = UNNotificationRequest(
-                identifier: "\(Category.loopNotRunning.rawValue)\(failureInterval)",
+                identifier: "\(LoopNotificationCategory.loopNotRunning.rawValue)\(failureInterval)",
                 content: notification,
                 trigger: UNTimeIntervalNotificationTrigger(
                     timeInterval: failureInterval + gracePeriod,
@@ -151,7 +143,7 @@ struct NotificationManager {
         // Clear out any existing not-running notifications
         UNUserNotificationCenter.current().getDeliveredNotifications { (notifications) in
             let loopNotRunningIdentifiers = notifications.filter({
-                $0.request.content.categoryIdentifier == Category.loopNotRunning.rawValue
+                $0.request.content.categoryIdentifier == LoopNotificationCategory.loopNotRunning.rawValue
             }).map({
                 $0.request.identifier
             })
@@ -166,10 +158,10 @@ struct NotificationManager {
         notification.title = NSLocalizedString("Pump Battery Low", comment: "The notification title for a low pump battery")
         notification.body = NSLocalizedString("Change the pump battery immediately", comment: "The notification alert describing a low pump battery")
         notification.sound = UNNotificationSound.default()
-        notification.categoryIdentifier = Category.pumpBatteryLow.rawValue
+        notification.categoryIdentifier = LoopNotificationCategory.pumpBatteryLow.rawValue
 
         let request = UNNotificationRequest(
-            identifier: Category.pumpBatteryLow.rawValue,
+            identifier: LoopNotificationCategory.pumpBatteryLow.rawValue,
             content: notification,
             trigger: nil
         )
@@ -178,7 +170,7 @@ struct NotificationManager {
     }
 
     static func clearPumpBatteryLowNotification() {
-        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [Category.pumpBatteryLow.rawValue])
+        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [LoopNotificationCategory.pumpBatteryLow.rawValue])
     }
 
     static func sendPumpReservoirEmptyNotification() {
@@ -187,11 +179,11 @@ struct NotificationManager {
         notification.title = NSLocalizedString("Pump Reservoir Empty", comment: "The notification title for an empty pump reservoir")
         notification.body = NSLocalizedString("Change the pump reservoir now", comment: "The notification alert describing an empty pump reservoir")
         notification.sound = UNNotificationSound.default()
-        notification.categoryIdentifier = Category.pumpReservoirEmpty.rawValue
+        notification.categoryIdentifier = LoopNotificationCategory.pumpReservoirEmpty.rawValue
 
         let request = UNNotificationRequest(
             // Not a typo: this should replace any pump reservoir low notifications
-            identifier: Category.pumpReservoirLow.rawValue,
+            identifier: LoopNotificationCategory.pumpReservoirLow.rawValue,
             content: notification,
             trigger: nil
         )
@@ -220,10 +212,10 @@ struct NotificationManager {
         }
 
         notification.sound = UNNotificationSound.default()
-        notification.categoryIdentifier = Category.pumpReservoirLow.rawValue
+        notification.categoryIdentifier = LoopNotificationCategory.pumpReservoirLow.rawValue
 
         let request = UNNotificationRequest(
-            identifier: Category.pumpReservoirLow.rawValue,
+            identifier: LoopNotificationCategory.pumpReservoirLow.rawValue,
             content: notification,
             trigger: nil
         )
@@ -232,6 +224,6 @@ struct NotificationManager {
     }
 
     static func clearPumpReservoirNotification() {
-        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [Category.pumpReservoirLow.rawValue])
+        UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [LoopNotificationCategory.pumpReservoirLow.rawValue])
     }
 }