Просмотр исходного кода

pass useAutotune to makeProfiles

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

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

@@ -134,7 +134,7 @@ final class BaseAPSManager: APSManager, Injectable {
         let now = Date()
         let temp = currentTemp(date: now)
 
-        let mainPublisher = openAPS.makeProfiles()
+        let mainPublisher = openAPS.makeProfiles(useAutotune: settings.useAutotune)
             .flatMap { _ in
                 self.openAPS.determineBasal(currentTemp: temp, clock: now)
             }

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

@@ -144,7 +144,7 @@ final class OpenAPS {
         }
     }
 
-    func makeProfiles() -> Future<Void, Never> {
+    func makeProfiles(useAutotune: Bool) -> Future<Void, Never> {
         Future { promise in
             self.processQueue.async {
                 let preferences = self.loadFileFromStorage(name: Settings.preferences)
@@ -155,7 +155,7 @@ final class OpenAPS {
                 let cr = self.loadFileFromStorage(name: Settings.carbRatios)
                 let tempTargets = self.loadFileFromStorage(name: Settings.tempTargets)
                 let model = self.loadFileFromStorage(name: Settings.model)
-                let autotune = self.loadFileFromStorage(name: Settings.autotune)
+                let autotune = useAutotune ? self.loadFileFromStorage(name: Settings.autotune) : .empty
 
                 let pumpProfile = self.makeProfile(
                     preferences: preferences,

+ 1 - 0
FreeAPS/Sources/Helpers/JSON.swift

@@ -62,6 +62,7 @@ typealias RawJSON = String
 
 extension RawJSON {
     static let null = "null"
+    static let empty = ""
 }
 
 extension Array: JSON where Element: JSON {}