Change order (bug fix) and text

FreeAPS/Sources/APS/APSManager.swift

@@ -616,7 +616,7 @@ final class BaseAPSManager: APSManager, Injectable {
                     }
                 }
 
-                var entriesPast2hours = storage.retrieve(file, as: [TDD].self)?
+                let entriesPast2hours = storage.retrieve(file, as: [TDD].self)?
                     .filter { $0.timestamp.addingTimeInterval(2.hours.timeInterval) > Date() }
                     .sorted { $0.timestamp > $1.timestamp } ?? []
 
@@ -639,9 +639,9 @@ final class BaseAPSManager: APSManager, Injectable {
                 }
 
                 let average7 = total / indeces
+                let average2hours = totalAmount / nrOfIndeces
                 let weight = preferences.weightPercentage
                 let weighted_average = weight * average2hours + (1 - weight) * average7
-                let average2hours = totalAmount / nrOfIndeces
 
                 let averages = TDD_averages(
                     average_7days: average7,

FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -132,7 +132,7 @@ extension PreferencesEditor {
                     displayName: "Weighted Average of TDD. Weight of past 24 hours:",
                     type: .decimal(keypath: \.weightPercentage),
                     infoText: NSLocalizedString(
-                        "Has to be > 0 and <= 1. Default is 0.65 (65 %) * past 24 hours. The rest will be from 7 days TDD average (0.35). To only use past 24 hours, set this to 1.",
+                        "Has to be > 0 and <= 1.\nDefault is 0.65 (65 %) * past 24 hours. The rest will be from 7 days TDD average (0.35). To only use past 24 hours, set this to 1.\nTo avoid sudden fluctuations, an average of past 2 hours of TDD calc is used as past 24 hours TDD.",
                         comment: "Weight of past 24 hours of TDD"
                     ),
                     settable: self