Add adjustment Factor to FPU ago

FreeAPS/Resources/json/defaults/freeaps/freeaps_settings.json

@@ -23,7 +23,7 @@
     "animatedBackground": false,
     "displayStatistics": false,
     "useFPUconversion": false
-    "individualAdjustmentFactor": 0.8,
+    "individualAdjustmentFactor": 0.5,
     "timeCap": 8,
     "minuteInterval": 60
 }

FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -26,7 +26,7 @@ struct FreeAPSSettings: JSON, Equatable {
     var animatedBackground: Bool = false
     var displayStatistics: Bool = false
     var useFPUconversion: Bool = false
-    var individualAdjustmentFactor: Decimal = 0.8
+    var individualAdjustmentFactor: Decimal = 0.5
     var timeCap: Decimal = 8
     var minuteInterval: Int = 60
 }

FreeAPS/Sources/Modules/AddCarbs/AddCarbsStateModel.swift

@@ -24,17 +24,18 @@ extension AddCarbs {
             }
 
             // Convert fat and protein to carb equivalents and store as future carbs
-            let fpucarb = (0.4 * protein) + (0.9 * fat)
-            let fpus = ((fat * 9.0) + (protein * 4.0)) / 100.0
+            let fpucarb = 0.4 * protein + 0.9 * fat
+            let fpus = (fat * 9.0 + protein * 4.0) / 100.0
             // Default is 1 hour (60 minutes)
             let timeInterval = 60 * settings.settings.minuteInterval
             // Deffault is 8 hours
             let timeCap = settings.settings.timeCap
+            let adjustment = settings.settings.individualAdjustmentFactor
             var counter: Decimal = (fpus * 2) - 1.0
             counter = min(timeCap, counter)
             var roundedCounter: Decimal = 0
             NSDecimalRound(&roundedCounter, &counter, 0, .up)
-            let carbequiv = fpucarb / roundedCounter
+            let carbequiv = (fpucarb / roundedCounter) * adjustment
 
             while counter > 0, counter <= timeCap {
                 let newdate = 1.0 + trunc(Double(truncating: counter as NSNumber))

FreeAPS/Sources/Modules/FPUConfig/View/FPUConfigRootView.swift

@@ -43,6 +43,13 @@ extension FPUConfig {
                         DecimalTextField("0.8", value: $state.individualAdjustmentFactor, formatter: conversionFormatter)
                     }
                 }
+
+                Section(
+                    footer: Text(
+                        "Allows fat and protein to be converted to future carb equivalents.\n\nDefault settings:\nTime Cap: 8 hours\nInterval: 60 min\nFactor: 0.5"
+                    )
+                )
+                    {}
             }
             .onAppear(perform: configureView)
             .navigationBarTitle("Fat and Protein")