Merge branch 'settings-update' of https://github.com/tmhastings/Trio-dev into settings-update

FreeAPS/Sources/Modules/CGM/View/CGMRootView.swift

@@ -64,7 +64,7 @@ extension CGM {
                                             selectedVerboseHint =
                                                 AnyView(
                                                     Text(
-                                                        "Dexcom G5 \n\nDexcom G6/ONE \n\nDexcom G7/ONE+ \n\nDexcom Share \n\nFreestyle Libre \n\nFreestyle Libre Demo \n\nGlucose Simulator \n\nMedtronic Enlite \n\nNightscout \n\nxDrip4iOS."
+                                                        "● Dexcom G5 \n● Dexcom G6/ONE \n● Dexcom G7/ONE+ \n● Dexcom Share \n● Freestyle Libre \n● Freestyle Libre Demo \n● Glucose Simulator \n● Medtronic Enlite \n● Nightscout \n● xDrip4iOS."
                                                     )
                                                 )
                                             shouldDisplayHint.toggle()

FreeAPS/Sources/Modules/CalendarEventSettings/View/CalendarEventSettingsRootView.swift

@@ -96,15 +96,16 @@ extension CalendarEventSettings {
                         verboseHint: VStack {
                             Text("Default: OFF").bold()
                             Text("""
-                            When enabled, the calendar event created will indicate whether glucose readings are in-range or out-of-range using the following color emojis:
-                            🟢: In-Range
-                            🟠: Above-Range
-                            🔴: Below-Range
+                            
+                                 When enabled, the calendar event created will indicate whether glucose readings are in-range or out-of-range using the following color emojis:
+                                🟢: In-Range
+                                🟠: Above-Range
+                                🔴: Below-Range    
 
-                            If "Display IOB and COB" is also enabled, "IOB" and "COB" will be replaced with the following emojis:
-                            💉: IOB
-                            🥨: COB
-                            """)
+                                If "Display IOB and COB" is also enabled, "IOB" and "COB" will be replaced with the following emojis:
+                                💉: IOB
+                                🥨: COB
+                                """)
                         }
                     )
 

FreeAPS/Sources/Modules/DynamicSettings/View/DynamicSettingsRootView.swift

@@ -80,18 +80,18 @@ extension DynamicSettings {
 
                         Dynamic ISF allows Trio to calculate a new ISF with each loop cycle by considering your current blood glucose (BG), total daily dose (TDD) of insulin, and adjustment factor (AF). This helps tailor your insulin response more accurately in real-time. 
 
-                         Dynamic ISF calculates a Dynamic Ratio, determining how much your Profile ISF will be adjusted every loop cycle, ensuring it stays within safe limits set by your Autosens Min/Max settings. It provides more precise insulin dosing by responding to changes in insulin needs throughout the day.
+                        Dynamic ISF calculates a Dynamic Ratio, determining how much your profile ISF will be adjusted every loop cycle, ensuring it stays within safe limits set by your Autosens Min/Max settings. It provides more precise insulin dosing by responding to changes in insulin needs throughout the day.
                         """)
                         Text("""
 
-                         Dynamic Ratio = Profile ISF × AF × TDD × log(BG ÷ Insulin Factor + 1) ÷ 1800
+                         Dynamic Ratio = (Profile ISF) × AF × TDD × (log(BG ÷ (Insulin Factor) + 1)) ÷ 1800
 
-                         New ISF = Profile ISF / Dynamic Ratio
+                         New ISF = (Profile ISF) ÷ (Dynamic Ratio)
 
-                         Insulin Factor = 120 - Insulin Peak Time
+                         Insulin Factor = 120 - (Insulin Peak Time)
                         """).italic()
                     },
-                    headerText: "Dynamic ISF (Sensitivity)"
+                    headerText: "Dynamic Settings"
                 )
 
                 if state.useNewFormula {
@@ -157,10 +157,10 @@ extension DynamicSettings {
 
                             """)
                             Text("""
-                            It’s recommended to not set Autosens Max above 1.5 to maintain safe insulin dosing.
+                            It is not recommended to set Autosens Max above 150% to maintain safe insulin dosing.
 
                             """).italic()
-                            Text("There has been no empirical data analysis to support the use of the Sigmoid Formula.").italic()
+                            Text("There has been no empirical data analysis to support the use of the Sigmoid Formula for dynamic sensitivity determination.").italic()
                                 .bold()
                         }
                     )
@@ -301,9 +301,9 @@ extension DynamicSettings {
 
                             """)
                             Text("""
-                            Autosens Ratio = (Weighted Average of TDD)/(10-day Average of TDD)
+                            Autosens Ratio = (Weighted Average of TDD) ÷ (10-day Average of TDD)
 
-                            New basal profile = current basal profile * Autosens Ratio
+                            New Basal Profile = (Current Basal Profile) × (Autosens Ratio)
                             """).italic()
                         }
                     )

FreeAPS/Sources/Modules/GeneralSettings/View/UnitsLimitsSettingsRootView.swift

@@ -59,18 +59,22 @@ extension UnitsLimitsSettings {
                     type: .decimal("maxIOB"),
                     label: NSLocalizedString("Max IOB", comment: "Max IOB"),
                     miniHint: """
-                    The highest amount of insulin Trio will allow to be active at any given time. This must be greater than 0 for any automatic adjustments to be given.
+                    The highest amount of insulin Trio can allow to be active at any given time.
                     Default: 0 units
                     """,
                     verboseHint: VStack {
                         Text("Default: 0 units").bold()
                         Text("""
+                             
+                             This must be greater than 0 for any automatic temp basals or SMBs to be given.
+                             """).bold().italic()
+                        Text("""
 
                         The maximum amount of Insulin On Board (IOB) from all sources - both basal and bolus - that Trio is allowed to accumulate to treat higher-than-target glucose.
 
                         If a calculated amount exceeds this limit, the suggested and/or delivered amount will be reduced so that active insulin on board (IOB) will not exceed this safety limit.
                         """)
-                        Text("Manual boluses are not restricted by this limit.").italic()
+                        Text("Manually entered bolus amounts are not restricted by this limit.").italic()
                     }
                 )
 
@@ -149,7 +153,7 @@ extension UnitsLimitsSettings {
                     type: .decimal("maxCOB"),
                     label: NSLocalizedString("Max COB", comment: "Max COB"),
                     miniHint: """
-                    The highest amount of carbs Trio will use in dosing calculations.
+                    The highest amount of carbs Trio can use in dosing calculations.
                     Default: 120 carbs
                     """,
                     verboseHint: VStack {

FreeAPS/Sources/Modules/TargetBehavoir/View/TargetBehavoirRootView.swift

@@ -59,7 +59,7 @@ extension TargetBehavoir {
                     Default: OFF
                     """,
                     verboseHint: VStack {
-                        Text("Exercise-mode").bold().italic()
+                        Text("Exercise Mode").bold().italic()
                         Text("Default: OFF").bold()
                         Text("""
 
@@ -101,12 +101,12 @@ extension TargetBehavoir {
                         Text("Eating Soon Mode").bold().italic()
                         Text("Default: OFF").bold()
                         Text("""
-
-                        When this feature is enabled, setting a temporary target below 100 mg/dL will increase the autosens ratio used for ISF and basal adjustments, resulting in more insulin delivered overall. This scales with the temporary target set; the lower the temp target, the higher the autosens ratio used.
-
-                        If Half Basal Exercise Target is 160, a temp target of 95 mg/dL uses an autosens ratio of 1.09. A temp target of 85 mg/dL uses an autosens ratio of 1.33.
-
-                        """)
+                        
+                            When this feature is enabled, setting a temporary target below 100 mg/dL will increase the Autosens Ratio used for ISF and basal adjustments, resulting in more insulin delivered overall. This scales with the temporary target set; the lower the Temp Target, the higher the Autosens Ratio used.
+                            
+                            If Half Basal Exercise Target is 160, a Temp Target of 95 mg/dL uses an Autosens Ratio of 1.09. A Temp Target of 85 mg/dL uses an Autosens Ratio of 1.33.
+                            
+                            """)
                         Text("The effect of this can be adjusted with the Half Basal Exercise Target").italic()
                     }
                 )