فهرست منبع

fixes for zero temp and showing boli in main chart

polscm32 2 سال پیش
والد
کامیت
6a3fa1cd63

+ 1 - 1
FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -39,7 +39,7 @@
       },
       {
         "package": "SwiftCharts",
-        "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts",
+        "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts.git",
         "state": {
           "branch": "master",
           "revision": "c354c1945bb35a1f01b665b22474f6db28cba4a2",

+ 2 - 2
FreeAPS/Sources/APS/APSManager.swift

@@ -675,13 +675,13 @@ final class BaseAPSManager: APSManager, Injectable {
                 return Fail(error: error).eraseToAnyPublisher()
             }
 
-            if determination.rate == 0 || determination.duration == 0 {
+            guard let rate = determination.rate else {
                 debug(.apsManager, "No temp required")
                 return Just(()).setFailureType(to: Error.self)
                     .eraseToAnyPublisher()
             }
             return pump.enactTempBasal(
-                unitsPerHour: Double(truncating: determination.rate ?? 0),
+                unitsPerHour: Double(truncating: rate),
                 for: TimeInterval(determination.duration * 60)
             ).map { _ in
                 let temp = TempBasal(

+ 6 - 2
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -190,9 +190,13 @@ extension Bolus {
 
                 currentBG = Decimal(lastGlucose)
                 deltaBG = delta
-                debugPrint("Bolus State: \(#function) \(CoreDataStack.identifier) \(DebuggingIdentifiers.succeeded) fetched glucose")
+                debugPrint(
+                    "Bolus State: \(#function) \(CoreDataStack.identifier) \(DebuggingIdentifiers.succeeded) fetched glucose"
+                )
             } catch {
-                debugPrint("Bolus State: \(#function) \(CoreDataStack.identifier) \(DebuggingIdentifiers.failed) failed to fetch glucose")
+                debugPrint(
+                    "Bolus State: \(#function) \(CoreDataStack.identifier) \(DebuggingIdentifiers.failed) failed to fetch glucose"
+                )
             }
         }
 

+ 1 - 1
Model/Helper/InsulinStored+helper.swift

@@ -4,7 +4,7 @@ import Foundation
 extension InsulinStored {
     static func fetch(_ predicate: NSPredicate = .predicateForOneDayAgo) -> NSFetchRequest<InsulinStored> {
         let request = InsulinStored.fetchRequest()
-        request.sortDescriptors = [NSSortDescriptor(keyPath: \InsulinStored.date, ascending: false)]
+        request.sortDescriptors = [NSSortDescriptor(keyPath: \InsulinStored.date, ascending: true)]
         request.fetchLimit = 100
         request.predicate = predicate
         return request