|
|
@@ -393,13 +393,20 @@ final class OpenAPS {
|
|
|
// Perform asynchronous calls in parallel
|
|
|
async let pumpHistoryObjectIDs = fetchPumpHistoryObjectIDs() ?? []
|
|
|
async let carbs = fetchAndProcessCarbs(additionalCarbs: simulatedCarbsAmount ?? 0, carbsDate: simulatedCarbsDate)
|
|
|
- async let glucose = fetchAndProcessGlucose(context: context, shouldSmoothGlucose: shouldSmoothGlucose, fetchLimit: 72)
|
|
|
+
|
|
|
+ var preferences = await storage.retrieveAsync(OpenAPS.Settings.preferences, as: Preferences.self) ?? Preferences()
|
|
|
+ let glucoseFetchLimit = Int((preferences.maxMealAbsorptionTime * 12).rounded(scale: 0, roundingMode: .up))
|
|
|
+ async let glucose = fetchAndProcessGlucose(
|
|
|
+ context: context,
|
|
|
+ shouldSmoothGlucose: shouldSmoothGlucose,
|
|
|
+ fetchLimit: glucoseFetchLimit
|
|
|
+ )
|
|
|
+
|
|
|
async let prepareTrioCustomOrefVariables = prepareTrioCustomOrefVariables()
|
|
|
async let profileAsync = loadFileFromStorageAsync(name: Settings.profile)
|
|
|
async let basalAsync = loadFileFromStorageAsync(name: Settings.basalProfile)
|
|
|
async let autosenseAsync = loadFileFromStorageAsync(name: Settings.autosense)
|
|
|
async let reservoirAsync = loadFileFromStorageAsync(name: Monitor.reservoir)
|
|
|
- async let preferencesAsync = storage.retrieveAsync(OpenAPS.Settings.preferences, as: Preferences.self) ?? Preferences()
|
|
|
async let hasSufficientTddForDynamic = tddStorage.hasSufficientTDD()
|
|
|
|
|
|
// Await the results of asynchronous tasks
|
|
|
@@ -450,8 +457,6 @@ final class OpenAPS {
|
|
|
storage.save(iob, as: Monitor.iob)
|
|
|
}
|
|
|
|
|
|
- var preferences = await preferencesAsync
|
|
|
-
|
|
|
if !hasSufficientTdd, preferences.useNewFormula || (preferences.useNewFormula && preferences.sigmoid) {
|
|
|
debug(.openAPS, "Insufficient TDD for dynamic formula; disabling for determine basal run.")
|
|
|
preferences.useNewFormula = false
|