Remove Auto ISF

FreeAPS/Sources/Models/Preferences.swift

@@ -6,12 +6,7 @@ struct Preferences: JSON {
     var currentBasalSafetyMultiplier: Decimal = 4
     var autosensMax: Decimal = 1.2
     var autosensMin: Decimal = 0.7
-    var autoisf: Bool = false
-    var autoISFhourlyChange: Decimal = 0.25
-    var autoISFmax: Decimal = 1.3
-    var autoISFmin: Decimal = 1
     var smbDeliveryRatio: Decimal = 0.5
-    var smbMaxRangeExtension: Decimal = 1
     var rewindResetsAutosens: Bool = true
     var highTemptargetRaisesSensitivity: Bool = false
     var lowTemptargetLowersSensitivity: Bool = false
@@ -47,20 +42,6 @@ struct Preferences: JSON {
     var noisyCGMTargetMultiplier: Decimal = 1.3
     var suspendZerosIOB: Bool = true
     var timestamp: Date?
-    var floatingcarbs: Bool = false
-    var smbDeliveryRatioBGrange: Decimal = 0
-    var smbDeliveryRatioMin: Decimal = 0.5
-    var smbDeliveryRatioMax: Decimal = 0.75
-    var enableautoISFwithCOB: Bool = false
-    var higherISFrangeWeight: Decimal = 0
-    var lowerISFrangeWeight: Decimal = 0
-    var deltaISFrangeWeight: Decimal = 0
-    var postMealISFweight: Decimal = 0
-    var postMealISFduration: Decimal = 3
-    var postMealISFalways: Bool = false
-    var bgAccelISFweight: Decimal = 0
-    var bgBrakeISFweight: Decimal = 0
-    var enableBGacceleration: Bool = false
     var maxDeltaBGthreshold: Decimal = 0.2
     var adjustmentFactor: Decimal = 1.0
     var enableChris: Bool = false
@@ -81,12 +62,7 @@ extension Preferences {
         case currentBasalSafetyMultiplier = "current_basal_safety_multiplier"
         case autosensMax = "autosens_max"
         case autosensMin = "autosens_min"
-        case autoisf = "use_autoisf"
-        case autoISFhourlyChange = "autoisf_hourlychange"
-        case autoISFmax = "autoisf_max"
-        case autoISFmin = "autoisf_min"
         case smbDeliveryRatio = "smb_delivery_ratio"
-        case smbMaxRangeExtension = "smb_max_range_extension"
         case rewindResetsAutosens = "rewind_resets_autosens"
         case highTemptargetRaisesSensitivity = "high_temptarget_raises_sensitivity"
         case lowTemptargetLowersSensitivity = "low_temptarget_lowers_sensitivity"
@@ -121,20 +97,6 @@ extension Preferences {
         case carbsReqThreshold
         case noisyCGMTargetMultiplier
         case suspendZerosIOB = "suspend_zeros_iob"
-        case floatingcarbs = "floating_carbs"
-        case smbDeliveryRatioBGrange = "smb_delivery_ratio_bg_range"
-        case smbDeliveryRatioMin = "smb_delivery_ratio_min"
-        case smbDeliveryRatioMax = "smb_delivery_ratio_max"
-        case enableautoISFwithCOB = "enableautoisf_with_COB"
-        case higherISFrangeWeight = "higher_ISFrange_weight"
-        case lowerISFrangeWeight = "lower_ISFrange_weight"
-        case deltaISFrangeWeight = "delta_ISFrange_weight"
-        case postMealISFweight = "postmeal_ISF_weight"
-        case postMealISFduration = "postmeal_ISF_duration"
-        case postMealISFalways = "enableppisf_always"
-        case bgAccelISFweight = "bgAccel_ISF_weight"
-        case bgBrakeISFweight = "bgBrake_ISF_weight"
-        case enableBGacceleration = "enable_BG_acceleration"
         case maxDeltaBGthreshold = "maxDelta_bg_threshold"
         case adjustmentFactor
         case enableChris

FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -481,183 +481,6 @@ extension PreferencesEditor {
                 )
             ]
 
-            let autoISF = [
-                Field(
-                    displayName: "Enable AutoISF",
-                    type: .boolean(keypath: \.autoisf),
-                    infoText: NSLocalizedString(
-                        "Defaults to false. Adapt ISF when glucose is stuck at high levels, only works without COB.\n\nRead up on:\nhttps://github.com/ga-zelle/autoISF/tree/2.8.2",
-                        comment: "Enable AutoISF"
-                    ),
-                    settable: self
-                )
-            ]
-
-            let autoISFsettings = [
-                Field(
-                    displayName: "Enable Floating Carbs",
-                    type: .boolean(keypath: \.floatingcarbs),
-                    infoText: NSLocalizedString(
-                        "Defaults to false. If true, then dose slightly more aggressively by using all entered carbs for calculating COBpredBGs. This avoids backing off too quickly as COB decays. Even with this option, oref0 still switches gradually from using COBpredBGs to UAMpredBGs proportionally to how many carbs are left as COB. Summary: use all entered carbs in the future for predBGs & don't decay them as COB, only once they are actual.",
-                        comment: "Floating Carbs"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "Enable AutoISF with COB",
-                    type: .boolean(keypath: \.enableautoISFwithCOB),
-                    infoText: NSLocalizedString(
-                        "Enables autoISF not just for UAM, but also with COB\n\nRead up on:\nhttps://github.com/ga-zelle/autoISF/tree/2.8.2_dev_parabola",
-                        comment: "Enable autoISF with COB"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "Enable BG acceleartion in AutoISF2.2",
-                    type: .boolean(keypath: \.enableBGacceleration),
-                    infoText: NSLocalizedString(
-                        "Enables the BG acceleration adaptiions for autoISF\n\nRead up on:\nhttps://github.com/ga-zelle/autoISF/tree/2.8.2dev_ai2.2",
-                        comment: "Enable BG accel in autoISF"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "AutoISF HourlyMaxChange",
-                    type: .decimal(keypath: \.autoISFhourlyChange),
-                    infoText: NSLocalizedString(
-                        "Defaults to false. Rate at which autoISF grows per hour assuming bg is twice target. When value = 1.0, ISF is reduced to 50% after 1 hour of BG at 2x target.",
-                        comment: "AutoISF HourlyMaxChange"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "AutoISF Max",
-                    type: .decimal(keypath: \.autoISFmax),
-                    infoText: NSLocalizedString(
-                        "Multiplier cap on how high the autoISF ratio can be and therefore how low it can adjust ISF.",
-                        comment: "AutoISF Max"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "SMB Max RangeExtension",
-                    type: .decimal(keypath: \.smbMaxRangeExtension),
-                    infoText: NSLocalizedString(
-                        "Default value: 1. This is another key OpenAPS safety cap, and specifies by what factor you can exceed the regular 120 maxSMB/maxUAM minutes. Increase this experimental value slowly and with caution. Available only when autoISF is enabled.",
-                        comment: "SMB Max RangeExtension"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "SMB DeliveryRatio BG Range",
-                    type: .decimal(keypath: \.smbDeliveryRatioBGrange),
-                    infoText: NSLocalizedString(
-                        "Default value: 0, Sensible is bteween 40 and 120. The linearly increasing SMB delivery ratio is mapped to the glucose range [target_bg, target_bg+bg_range]. At target_bg the SMB ratio is smb_delivery_ratio_min, at target_bg+bg_range it is smb_delivery_ratio_max. With 0 the linearly increasing SMB ratio is disabled and the fix smb_delivery_ratio is used.",
-                        comment: "SMB DeliveryRatio BG Range"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "SMB DeliveryRatio BG Minimum",
-                    type: .decimal(keypath: \.smbDeliveryRatioMin),
-                    infoText: NSLocalizedString(
-                        "Default value: 0.5 This is the lower end of a linearly increasing SMB Delivery Ratio rather than the fix value above in SMB DeliveryRatio.",
-                        comment: "SMB DeliveryRatio Minimum"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "SMB DeliveryRatio BG Maximum",
-                    type: .decimal(keypath: \.smbDeliveryRatioMax),
-                    infoText: NSLocalizedString(
-                        "Default value: 0.5 This is the higher end of a linearly increasing SMB Delivery Ratio rather than the fix value above in SMB DeliveryRatio.",
-                        comment: "SMB DeliveryRatio Minimum"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "ISF weight while BG accelerates",
-                    type: .decimal(keypath: \.bgAccelISFweight),
-                    infoText: NSLocalizedString(
-                        "Default value: 0. This is the weight applied while glucose accelerates and which strengthens ISF. With 0 this contribution is effectively disabled. 0.15 might be a good starting point.",
-                        comment: "ISF acceleration weight"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "ISF weight while BG decelerates",
-                    type: .decimal(keypath: \.bgBrakeISFweight),
-                    infoText: NSLocalizedString(
-                        "Default value: 0. This is the weight applied while glucose decelerates and which weakens ISF. With 0 this contribution is effectively disabled. 0.15 might be a good starting point.",
-                        comment: "ISF decceleration weight"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "AutoISF Min",
-                    type: .decimal(keypath: \.autoISFmin),
-                    infoText: NSLocalizedString(
-                        "This is a multiplier cap for autoISF to set a limit on how low the autoISF ratio can be, which in turn determines how high it can adjust ISF.",
-                        comment: "AutoISF Min"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "ISF weight for higher BG's",
-                    type: .decimal(keypath: \.higherISFrangeWeight),
-                    infoText: NSLocalizedString(
-                        "Default value: 0.0 This is the weight applied to the polygon which adapts ISF if glucose is above target. With 0.0 the effect is effectively disabled.",
-                        comment: "ISF high BG weight"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "ISF weight for lower BG's",
-                    type: .decimal(keypath: \.lowerISFrangeWeight),
-                    infoText: NSLocalizedString(
-                        "Default value: 0.0 This is the weight applied to the polygon which adapts ISF if glucose is below target. With 0.0 the effect is effectively disabled.",
-                        comment: "ISF low BG weight"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "ISF weight for higher BG deltas",
-                    type: .decimal(keypath: \.deltaISFrangeWeight),
-                    infoText: NSLocalizedString(
-                        "Default value: 0.0 This is the weight applied to the polygon which adapts ISF higher deltas. With 0.0 the effect is effectively disabled.",
-                        comment: "ISF higher delta BG weight"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "Enable always postprandial ISF adaption",
-                    type: .boolean(keypath: \.postMealISFalways),
-                    infoText: NSLocalizedString(
-                        "Enable the postprandial ISF adaptation all the time regardless of when the last meal was taken.",
-                        comment: "Enable postprandial ISF always"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "ISF weight for postprandial BG rise",
-                    type: .decimal(keypath: \.postMealISFweight),
-                    infoText: NSLocalizedString(
-                        "Default value: 0 This is the weight applied to the linear slope while glucose rises and  which adapts ISF. With 0 this contribution is effectively disabled.",
-                        comment: "ISF postprandial weight"
-                    ),
-                    settable: self
-                ),
-                Field(
-                    displayName: "Duration ISF postprandial adaption",
-                    type: .decimal(keypath: \.postMealISFduration),
-                    infoText: NSLocalizedString(
-                        "Default value: 3 This is the duration in hours how long after a meal the effect will be active. Oref will delete carb timing after 10 hours latest no matter what you enter.",
-                        comment: "ISF postprandial change duration"
-                    ),
-                    settable: self
-                )
-            ]
-
             sections = [
                 FieldSection(
                     displayName: NSLocalizedString("OpenAPS main settings", comment: "OpenAPS main settings"), fields: mainFields
@@ -676,17 +499,6 @@ extension PreferencesEditor {
                 FieldSection(
                     displayName: NSLocalizedString("OpenAPS other settings", comment: "OpenAPS other settings"),
                     fields: otherSettings
-                ),
-                FieldSection(
-                    displayName: NSLocalizedString("Use Auto ISF", comment: "Switch on/off experimental stuff"),
-                    fields: autoISF
-                ),
-                FieldSection(
-                    displayName: NSLocalizedString(
-                        "Auto ISF Settings. Forget about these if Auto ISF is toggled off",
-                        comment: "AutoISF Settings"
-                    ),
-                    fields: autoISFsettings
                 )
             ]
         }

FreeAPS/Sources/Views/TagCloudView.swift

@@ -55,12 +55,6 @@ struct TagCloudView: View {
     private func item(for textTag: String) -> some View {
         var colorOfTag: Color {
             switch textTag {
-            case textTag where textTag.contains("Not Floating"):
-                return .loopYellow
-            case textTag where textTag.contains("Floating Carbs"):
-                return .loopPink
-            case textTag where textTag.contains("autoISF"):
-                return .zt
             case textTag where textTag.contains("SMB Delivery Ratio:"):
                 return .uam
             case textTag where textTag.contains("Weighted avg:"),