my own preferences

mountrcg · May 26, 2024 · 9fffbcd · 9fffbcd
1 parent 3e87a1b
commit 9fffbcd
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 19 deletions.
diff --git a/FreeAPS/Sources/Models/Preferences.swift b/FreeAPS/Sources/Models/Preferences.swift
@@ -1,19 +1,19 @@
 import Foundation
 
 struct Preferences: JSON {
-    var maxIOB: Decimal = 0
-    var maxDailySafetyMultiplier: Decimal = 3
-    var currentBasalSafetyMultiplier: Decimal = 4
-    var autosensMax: Decimal = 1.2
-    var autosensMin: Decimal = 0.7
-    var smbDeliveryRatio: Decimal = 0.5
+    var maxIOB: Decimal = 9
+    var maxDailySafetyMultiplier: Decimal = 7
+    var currentBasalSafetyMultiplier: Decimal = 8
+    var autosensMax: Decimal = 1
+    var autosensMin: Decimal = 1
+    var smbDeliveryRatio: Decimal = 0.85
     var rewindResetsAutosens: Bool = true
     var highTemptargetRaisesSensitivity: Bool = false
     var lowTemptargetLowersSensitivity: Bool = false
     var sensitivityRaisesTarget: Bool = false
     var resistanceLowersTarget: Bool = false
     var advTargetAdjustments: Bool = false
-    var exerciseMode: Bool = false
+    var exerciseMode: Bool = true
     var halfBasalExerciseTarget: Decimal = 160
     var maxCOB: Decimal = 120
     var wideBGTargetRange: Bool = false
@@ -23,17 +23,19 @@ struct Preferences: JSON {
     var autotuneISFAdjustmentFraction: Decimal = 1.0
     var remainingCarbsFraction: Decimal = 1.0
     var remainingCarbsCap: Decimal = 90
-    var enableUAM: Bool = false
+    var enableUAM: Bool = true
     var a52RiskEnable: Bool = false
-    var enableSMBWithCOB: Bool = false
-    var enableSMBWithTemptarget: Bool = false
-    var enableSMBAlways: Bool = false
-    var enableSMBAfterCarbs: Bool = false
+    var enableSMBWithCOB: Bool = true
+    var enableSMBWithTemptarget: Bool = true
+    var enableSMBAlways: Bool = true
+    var enableSMB_high_bg: Bool = false
+    var enableSMB_high_bg_target: Decimal = 110
+    var enableSMBAfterCarbs: Bool = true
     var allowSMBWithHighTemptarget: Bool = false
-    var maxSMBBasalMinutes: Decimal = 30
-    var maxUAMSMBBasalMinutes: Decimal = 30
-    var smbInterval: Decimal = 3
-    var bolusIncrement: Decimal = 0.1
+    var maxSMBBasalMinutes: Decimal = 120
+    var maxUAMSMBBasalMinutes: Decimal = 120
+    var smbInterval: Decimal = 2
+    var bolusIncrement: Decimal = 0.05
     var curve: InsulinCurve = .rapidActing
     var useCustomPeakTime: Bool = false
     var insulinPeakTime: Decimal = 75
@@ -50,10 +52,40 @@ struct Preferences: JSON {
     var useWeightedAverage: Bool = false
     var weightPercentage: Decimal = 0.65
     var tddAdjBasal: Bool = false
-    var enableSMB_high_bg: Bool = false
-    var enableSMB_high_bg_target: Decimal = 110
     var threshold_setting: Decimal = 65
     var updateInterval: Decimal = 20
+    // start autoISF config
+    var floatingcarbs: Bool = false
+    var autoisf: Bool = true
+    var autoISFmax: Decimal = 2
+    var autoISFmin: Decimal = 0.5
+    var smbMaxRangeExtension: Decimal = 2
+    var smbDeliveryRatioBGrange: Decimal = 90
+    var smbDeliveryRatioMin: Decimal = 0.65
+    var smbDeliveryRatioMax: Decimal = 0.80
+    var enableautoISFwithCOB: Bool = true
+    var autoISFhourlyChange: Decimal = 0.6
+    var higherISFrangeWeight: Decimal = 0.3
+    var lowerISFrangeWeight: Decimal = 0.7
+    var deltaISFrangeWeight: Decimal = 0.6
+    var postMealISFalways: Bool = true
+    var postMealISFweight: Decimal = 0.02
+    var postMealISFduration: Decimal = 3
+    var enableBGacceleration: Bool = true
+    var bgAccelISFweight: Decimal = 0.1
+    var bgBrakeISFweight: Decimal = 0.15
+    var iobThreshold: Decimal = 0
+    var enableSMBEvenOnOddOff: Bool = true
+    var enableSMBEvenOnOddOffalways: Bool = true
+    var autoISFoffSport: Bool = true
+    // start B30 config
+    var enableB30: Bool = true
+    var B30iTimeStartBolus: Decimal = 1.5
+    var B30iTime: Decimal = 30
+    var B30iTimeTarget: Decimal = 90
+    var B30upperLimit: Decimal = 130
+    var B30upperDelta: Decimal = 8
+    var B30basalFactor: Decimal = 7
 }
 
 extension Preferences {

diff --git a/FreeAPS/Sources/Modules/Home/View/HomeRootView.swift b/FreeAPS/Sources/Modules/Home/View/HomeRootView.swift
@@ -580,7 +580,7 @@ extension Home {
                             DragGesture(minimumDistance: 10, coordinateSpace: .local)
                                 .onEnded { value in
                                     if value.translation.height < 0 {
-                                        state.isStatusPopupPresented = false
+                                        isStatusPopupPresented = false
                                     }
                                 }
                         )