|
@@ -116,13 +116,14 @@ final class OpenAPS {
|
|
|
let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
|
|
let pumpHistory = self.loadFileFromStorage(name: OpenAPS.Monitor.pumpHistory)
|
|
|
let glucose = self.loadFileFromStorage(name: Monitor.glucose)
|
|
let glucose = self.loadFileFromStorage(name: Monitor.glucose)
|
|
|
let profile = self.loadFileFromStorage(name: Settings.profile)
|
|
let profile = self.loadFileFromStorage(name: Settings.profile)
|
|
|
|
|
+ let pumpProfile = self.loadFileFromStorage(name: Settings.pumpProfile)
|
|
|
let carbs = self.loadFileFromStorage(name: Monitor.carbHistory)
|
|
let carbs = self.loadFileFromStorage(name: Monitor.carbHistory)
|
|
|
|
|
|
|
|
let autotunePreppedGlucose = self.autotunePrepare(
|
|
let autotunePreppedGlucose = self.autotunePrepare(
|
|
|
pumphistory: pumpHistory,
|
|
pumphistory: pumpHistory,
|
|
|
profile: profile,
|
|
profile: profile,
|
|
|
glucose: glucose,
|
|
glucose: glucose,
|
|
|
- pumpprofile: profile,
|
|
|
|
|
|
|
+ pumpprofile: pumpProfile,
|
|
|
carbs: carbs,
|
|
carbs: carbs,
|
|
|
categorizeUamAsBasal: categorizeUamAsBasal,
|
|
categorizeUamAsBasal: categorizeUamAsBasal,
|
|
|
tuneInsulinCurve: tuneInsulinCurve
|
|
tuneInsulinCurve: tuneInsulinCurve
|
|
@@ -134,7 +135,7 @@ final class OpenAPS {
|
|
|
let autotuneResult = self.autotuneRun(
|
|
let autotuneResult = self.autotuneRun(
|
|
|
autotunePreparedData: autotunePreppedGlucose,
|
|
autotunePreparedData: autotunePreppedGlucose,
|
|
|
previousAutotuneResult: previousAutotune ?? profile,
|
|
previousAutotuneResult: previousAutotune ?? profile,
|
|
|
- pumpProfile: profile
|
|
|
|
|
|
|
+ pumpProfile: pumpProfile
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
debug(.openAPS, "AUTOTUNE RESULT: \(autotuneResult)")
|
|
debug(.openAPS, "AUTOTUNE RESULT: \(autotuneResult)")
|