Ivan Valkou 5 лет назад
Родитель
Сommit
0330ce49ee

+ 1 - 1
FreeAPS/Resources/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>234</string>
+	<string>235</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>dexcomg6</string>

+ 1 - 1
FreeAPS/Sources/Models/Suggestion.swift

@@ -14,7 +14,7 @@ struct Suggestion: JSON, Equatable {
     let deliverAt: Date?
     let carbsReq: Decimal?
     let temp: TempType?
-    let bg: Int?
+    let bg: Decimal?
     let reservoir: Decimal?
     var timestamp: Date?
     var recieved: Bool?

+ 2 - 2
FreeAPS/Sources/Services/Network/NightscoutAPI.swift

@@ -51,13 +51,13 @@ extension NightscoutAPI {
             .eraseToAnyPublisher()
     }
 
-    func fetchLastGlucose(_ count: Int, sinceDate: Date? = nil) -> AnyPublisher<[BloodGlucose], Swift.Error> {
+    func fetchLastGlucose(sinceDate: Date? = nil) -> AnyPublisher<[BloodGlucose], Swift.Error> {
         var components = URLComponents()
         components.scheme = url.scheme
         components.host = url.host
         components.port = url.port
         components.path = Config.entriesPath
-        components.queryItems = [URLQueryItem(name: "count", value: "\(count)")]
+        components.queryItems = [URLQueryItem(name: "count", value: "\(2000)")]
         if let date = sinceDate {
             let dateItem = URLQueryItem(
                 name: "find[dateString][$gte]",

+ 1 - 1
FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -76,7 +76,7 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
         }
 
         let since = glucoseStorage.syncDate()
-        return nightscout.fetchLastGlucose(288, sinceDate: since)
+        return nightscout.fetchLastGlucose(sinceDate: since)
             .tryCatch({ (error) -> AnyPublisher<[BloodGlucose], Error> in
                 print(error.localizedDescription)
                 return Just([]).setFailureType(to: Error.self).eraseToAnyPublisher()