Ivan Valkou 4 лет назад
Родитель
Сommit
36e6b2fa1b

+ 7 - 1
FreeAPS/Sources/APS/APSManager.swift

@@ -547,7 +547,7 @@ final class BaseAPSManager: APSManager, Injectable {
             enacted.timestamp = Date()
             enacted.recieved = received
             storage.save(enacted, as: OpenAPS.Enact.enacted)
-            debug(.apsManager, "Suggestion enacted")
+            debug(.apsManager, "Suggestion enacted. Received: \(received)")
             DispatchQueue.main.async {
                 self.broadcaster.notify(EnactedSuggestionObserver.self, on: .main) {
                     $0.enactedSuggestionDidUpdate(enacted)
@@ -582,8 +582,10 @@ private extension PumpManager {
             self.enactTempBasal(unitsPerHour: unitsPerHour, for: duration) { result in
                 switch result {
                 case let .success(dose):
+                    debug(.apsManager, "Temp basal succeded: \(unitsPerHour) for: \(duration)")
                     promise(.success(dose))
                 case let .failure(error):
+                    debug(.apsManager, "Temp basal failed: \(unitsPerHour) for: \(duration)")
                     promise(.failure(error))
                 }
             }
@@ -595,8 +597,10 @@ private extension PumpManager {
             self.enactBolus(units: units, automatic: automatic) { result in
                 switch result {
                 case let .success(dose):
+                    debug(.apsManager, "Bolus succeded: \(units)")
                     promise(.success(dose))
                 case let .failure(error):
+                    debug(.apsManager, "Bolus failed: \(units)")
                     promise(.failure(error))
                 }
             }
@@ -608,8 +612,10 @@ private extension PumpManager {
             self.cancelBolus { result in
                 switch result {
                 case let .success(dose):
+                    debug(.apsManager, "Cancel Bolus succeded")
                     promise(.success(dose))
                 case let .failure(error):
+                    debug(.apsManager, "Cancel Bolus failed")
                     promise(.failure(error))
                 }
             }

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

@@ -123,7 +123,7 @@ final class BaseDeviceDataManager: DeviceDataManager, Injectable {
         pumpUpdateCancellable = Future<Bool, Never> { [unowned self] promise in
             pumpUpdatePromise = promise
             debug(.deviceManager, "Waiting for pump update and loop recommendation")
-            processQueue.async {
+            processQueue.safeSync {
                 pumpManager.ensureCurrentPumpData {
                     debug(.deviceManager, "Pump data updated.")
                 }

+ 1 - 1
FreeAPS/Sources/Modules/AddTempTarget/View/AddTempTargetRootView.swift

@@ -100,7 +100,7 @@ extension AddTempTarget {
                         Text(state.units.rawValue)
                             .foregroundColor(.secondary)
                             .font(.caption)
-                        Text("for \(formatter.string(from: preset.duration as NSNumber)!) min")
+                        Text("for" + " \(formatter.string(from: preset.duration as NSNumber)!) " + "min")
                             .foregroundColor(.secondary)
                             .font(.caption)
                         Spacer()