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

rework autotune core so it takes github version of bundle and added PREPARE script

Den 5 лет назад
Родитель
Сommit
67188d6d0f

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/autotune-core.js


+ 17 - 0
FreeAPS/Resources/javascript/prepare/autotune-core.js

@@ -0,0 +1,17 @@
+function generate(prepped_glucose_data,previous_autotune_data,pumpprofile_data){
+  if (!pumpprofile_data.useCustomPeakTime) {
+      previous_autotune_data.dia = pumpprofile_data.dia;
+      previous_autotune_data.insulinPeakTime = pumpprofile_data.insulinPeakTime;
+    }
+
+    // Always keep the curve value up to date with what's in the user preferences
+    previous_autotune_data.curve = pumpprofile_data.curve;
+
+    inputs = {
+        preppedGlucose: prepped_glucose_data
+      , previousAutotune: previous_autotune_data
+      , pumpProfile: pumpprofile_data
+    };
+
+    return freeaps(inputs);
+}

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

@@ -149,7 +149,8 @@ final class OpenAPS {
         dispatchPrecondition(condition: .onQueue(processQueue))
         dispatchPrecondition(condition: .onQueue(processQueue))
         return jsWorker.inCommonContext { worker in
         return jsWorker.inCommonContext { worker in
             worker.evaluate(script: Script(name: "bundle/autotune-core"))
             worker.evaluate(script: Script(name: "bundle/autotune-core"))
-            return worker.call(function: "freeaps", with: [
+            worker.evaluate(script: Script(name: "prepare/autotune-core"))
+            return worker.call(function: "generate", with: [
                 autotuneprepareddata,
                 autotuneprepareddata,
                 previousautotuneresult,
                 previousautotuneresult,
                 pumpprofile
                 pumpprofile