Ivan Valkou пре 4 година
родитељ
комит
732fda31e7

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

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/ivalkou/LibreTransmitterX",
         "state": {
           "branch": null,
-          "revision": "af874b58f03554d92053e06d33fd1b638b721552",
-          "version": "1.0.8"
+          "revision": "9c5d68262eef51365114213ebd4dee91687eeeed",
+          "version": "1.0.12"
         }
       },
       {

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

@@ -535,7 +535,7 @@ final class BaseAPSManager: APSManager, Injectable {
     }
 
     private func reportEnacted(suggestion: Suggestion, received: Bool) {
-        if suggestion.deliverAt != nil, suggestion.rate != nil || suggestion.units != nil {
+        if suggestion.deliverAt != nil {
             var enacted = suggestion
             enacted.timestamp = Date()
             enacted.recieved = received

+ 0 - 4
FreeAPS/Sources/Models/Suggestion.swift

@@ -19,10 +19,6 @@ struct Suggestion: JSON, Equatable {
     let isf: Int?
     var timestamp: Date?
     var recieved: Bool?
-
-    var isNoTempRequired: Bool {
-        reason.contains("no temp required")
-    }
 }
 
 struct Predictions: JSON, Equatable {

+ 1 - 1
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -239,7 +239,7 @@ extension Home {
             if closedLoop,
                let enactedSuggestion = enactedSuggestion,
                let timestamp = enactedSuggestion.timestamp,
-               enactedSuggestion.deliverAt == suggestion.deliverAt, suggestion.rate != nil || suggestion.units != nil
+               enactedSuggestion.deliverAt == suggestion.deliverAt, enactedSuggestion.recieved == true
             {
                 statusTitle = "Enacted at \(dateFormatter.string(from: timestamp))"
             } else if let suggestedDate = suggestion.deliverAt {

+ 1 - 0
FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift

@@ -13,6 +13,7 @@ struct CurrentGlucoseView: View {
             formatter.minimumFractionDigits = 1
             formatter.maximumFractionDigits = 1
         }
+        formatter.roundingMode = .halfUp
         return formatter
     }
 

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/Header/LoopView.swift

@@ -78,7 +78,7 @@ struct LoopView: View {
     }
 
     private var actualSuggestion: Suggestion? {
-        if closedLoop, suggestion?.rate != nil || suggestion?.units != nil || suggestion?.isNoTempRequired ?? false {
+        if closedLoop, enactedSuggestion?.recieved == true {
             return enactedSuggestion ?? suggestion
         } else {
             return suggestion