Ivan Valkou 5 tahun lalu
induk
melakukan
b91e2499ac

+ 3 - 3
FreeAPS/Resources/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSFaceIDUsageDescription</key>
-	<string>For authorized acces to bolus</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -19,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>236</string>
+	<string>237</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>dexcomg6</string>
@@ -39,6 +37,8 @@
 	<string>Bluetooth is used to communicate with insulin pump and continuous glucose monitor devices</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>Bluetooth is used to communicate with insulin pump and continuous glucose monitor devices</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>For authorized acces to bolus</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

+ 2 - 2
FreeAPS/Resources/javascript/prepare/determine-basal.js

@@ -3,7 +3,7 @@ var printLog = function(...args) {};
 var process = { stderr: { write: printLog } };
 
 
-function generate(iob_data, currenttemp, glucose_data, profile, autosens_input = false, meal_input = false, microbolus = false, reservoir_input = false){
+function generate(iob_data, currenttemp, glucose_data, profile, autosens_input = false, meal_input = false, microbolus = false, reservoir_input = false, clock = null){
     var glucose_status = freeaps_glucoseGetLast(glucose_data);
     var autosens_data = null;
 
@@ -21,5 +21,5 @@ function generate(iob_data, currenttemp, glucose_data, profile, autosens_input =
         meal_data = meal_input;
     }
 
-    return freeaps_determineBasal(glucose_status, currenttemp, iob_data, profile, autosens_data, meal_data, freeaps_basalSetTemp, microbolus, reservoir_data, null);
+    return freeaps_determineBasal(glucose_status, currenttemp, iob_data, profile, autosens_data, meal_data, freeaps_basalSetTemp, microbolus, reservoir_data, clock);
 }

+ 6 - 3
FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -62,7 +62,8 @@ final class OpenAPS {
                     autosens: autosens.isEmpty ? .null : autosens,
                     meal: meal,
                     microBolusAllowed: true,
-                    reservoir: reservoir
+                    reservoir: reservoir,
+                    clock: clock
                 )
                 debug(.openAPS, "SUGGESTED: \(suggested)")
 
@@ -277,7 +278,8 @@ final class OpenAPS {
         autosens: JSON,
         meal: JSON,
         microBolusAllowed: Bool,
-        reservoir: JSON
+        reservoir: JSON,
+        clock: JSON
     ) -> RawJSON {
         dispatchPrecondition(condition: .onQueue(processQueue))
         return jsWorker.inCommonContext { worker in
@@ -295,7 +297,8 @@ final class OpenAPS {
                     autosens,
                     meal,
                     microBolusAllowed,
-                    reservoir
+                    reservoir,
+                    clock
                 ]
             )
         }

+ 2 - 0
FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -49,6 +49,8 @@ extension Settings {
                                 .navigationLink(to: .configEditor(file: OpenAPS.Settings.insulinSensitivities), from: self)
                             Text("Temp targets").chevronCell()
                                 .navigationLink(to: .configEditor(file: OpenAPS.Settings.tempTargets), from: self)
+                            Text("Meal").chevronCell()
+                                .navigationLink(to: .configEditor(file: OpenAPS.Monitor.meal), from: self)
                         }
 
                         Group {