diff --git a/FreeAPS/Resources/javascript/prepare/determine-basal.js b/FreeAPS/Resources/javascript/prepare/determine-basal.js index bb6f2e717..8a550a7e3 100644 --- a/FreeAPS/Resources/javascript/prepare/determine-basal.js +++ b/FreeAPS/Resources/javascript/prepare/determine-basal.js @@ -1,9 +1,9 @@ //для enact/smb-suggested.json параметры: monitor/iob.json monitor/temp_basal.json monitor/glucose.json settings/profile.json settings/autosens.json --meal monitor/meal.json --microbolus --reservoir monitor/reservoir.json -function generate(iob, currenttemp, glucose, profile, autosens = null, meal = null, microbolusAllowed = false, reservoir = null, clock = new Date()) { +function generate(iob, currenttemp, glucose, profile, autosens = null, meal = null, microbolusAllowed = false, reservoir = null, clock = new Date(), pump_history) { try { - var middlewareReason = middleware(iob, currenttemp, glucose, profile, autosens, meal, reservoir, clock); + var middlewareReason = middleware(iob, currenttemp, glucose, profile, autosens, meal, reservoir, clock, pump_history); console.log("Middleware reason: " + (middlewareReason || "Nothing changed")); } catch (error) { console.log("Invalid middleware: " + error); diff --git a/FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift b/FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift index 37eb3563b..ba79a815e 100644 --- a/FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift +++ b/FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift @@ -63,7 +63,8 @@ final class OpenAPS { autosens: autosens.isEmpty ? .null : autosens, meal: meal, microBolusAllowed: true, - reservoir: reservoir + reservoir: reservoir, + pumpHistory: pumpHistory ) debug(.openAPS, "SUGGESTED: \(suggested)") @@ -290,7 +291,8 @@ final class OpenAPS { autosens: JSON, meal: JSON, microBolusAllowed: Bool, - reservoir: JSON + reservoir: JSON, + pumpHistory: JSON ) -> RawJSON { dispatchPrecondition(condition: .onQueue(processQueue)) return jsWorker.inCommonContext { worker in @@ -314,7 +316,9 @@ final class OpenAPS { autosens, meal, microBolusAllowed, - reservoir + reservoir, + false, // clock + pumpHistory ] ) }