瀏覽代碼

Merge pull request #353 from loopandlearn/update_pump_manager

Update FreeAPS code to remove extra pod getStatus messages
Mike Plante 1 年之前
父節點
當前提交
8303f0a881
共有 4 個文件被更改,包括 3 次插入21 次删除
  1. 0 18
      FreeAPS/Sources/APS/APSManager.swift
  2. 1 1
      FreeAPS/Sources/APS/DeviceDataManager.swift
  3. 1 1
      OmniBLE
  4. 1 1
      OmniKit

+ 0 - 18
FreeAPS/Sources/APS/APSManager.swift

@@ -3,9 +3,6 @@ import CoreData
 import Foundation
 import Foundation
 import LoopKit
 import LoopKit
 import LoopKitUI
 import LoopKitUI
-import OmniBLE
-import OmniKit
-import RileyLinkKit
 import SwiftDate
 import SwiftDate
 import Swinject
 import Swinject
 
 
@@ -902,26 +899,11 @@ final class BaseAPSManager: APSManager, Injectable {
         bolusReporter?.addObserver(self)
         bolusReporter?.addObserver(self)
     }
     }
 
 
-    private func updateStatus() {
-        debug(.apsManager, "force update status")
-        guard let pump = pumpManager else {
-            return
-        }
-
-        if let omnipod = pump as? OmnipodPumpManager {
-            omnipod.getPodStatus { _ in }
-        }
-        if let omnipodBLE = pump as? OmniBLEPumpManager {
-            omnipodBLE.getPodStatus { _ in }
-        }
-    }
-
     private func clearBolusReporter() {
     private func clearBolusReporter() {
         bolusReporter?.removeObserver(self)
         bolusReporter?.removeObserver(self)
         bolusReporter = nil
         bolusReporter = nil
         processQueue.asyncAfter(deadline: .now() + 0.5) {
         processQueue.asyncAfter(deadline: .now() + 0.5) {
             self.bolusProgress.send(nil)
             self.bolusProgress.send(nil)
-            self.updateStatus()
         }
         }
     }
     }
 }
 }

+ 1 - 1
FreeAPS/Sources/APS/DeviceDataManager.swift

@@ -326,7 +326,7 @@ extension BaseDeviceDataManager: PumpManagerDelegate {
 
 
         if case .inProgress = status.bolusState {
         if case .inProgress = status.bolusState {
             bolusTrigger.send(true)
             bolusTrigger.send(true)
-        } else {
+        } else if status.bolusState != .canceling {
             bolusTrigger.send(false)
             bolusTrigger.send(false)
         }
         }
 
 

+ 1 - 1
OmniBLE

@@ -1 +1 @@
-Subproject commit 85fc3c6d4805d580acdf6592b220717b6e842558
+Subproject commit 9bb11c714d68f4b915ac484122b4c104fb1c6d3c

+ 1 - 1
OmniKit

@@ -1 +1 @@
-Subproject commit a80e38b1b7f203014b461f8aff8cead2c067e39d
+Subproject commit f55c08045bf8b3af7b47eaafcc3181bcf5c04681