Просмотр исходного кода

Change default unit to mg/dl because fuck mmol/L

Deniz Cengiz 1 год назад
Родитель
Сommit
7dc33bcfc8

+ 1 - 1
FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 struct FreeAPSSettings: JSON, Equatable {
-    var units: GlucoseUnits = .mmolL
+    var units: GlucoseUnits = .mgdL
     var closedLoop: Bool = false
     var allowAnnouncements: Bool = false
     var useAutotune: Bool = false

+ 1 - 1
FreeAPS/Sources/Modules/AddTempTarget/AddTempTargetStateModel.swift

@@ -21,7 +21,7 @@ extension AddTempTarget {
         @Published var hbt: Double = 160
         @Published var saveSettings: Bool = false
 
-        private(set) var units: GlucoseUnits = .mmolL
+        private(set) var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             units = settingsManager.settings.units

+ 1 - 1
FreeAPS/Sources/Modules/AutotuneConfig/AutotuneConfigStateModel.swift

@@ -9,7 +9,7 @@ extension AutotuneConfig {
         @Published var useAutotune = false
         @Published var onlyAutotuneBasals = false
         @Published var autotune: Autotune?
-        private(set) var units: GlucoseUnits = .mmolL
+        private(set) var units: GlucoseUnits = .mgdL
         @Published var publishedDate = Date()
         @Persisted(key: "lastAutotuneDate") private var lastAutotuneDate = Date() {
             didSet {

+ 1 - 1
FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift

@@ -21,7 +21,7 @@ extension Bolus {
         @Published var amount: Decimal = 0
         @Published var insulinRecommended: Decimal = 0
         @Published var insulinRequired: Decimal = 0
-        @Published var units: GlucoseUnits = .mmolL
+        @Published var units: GlucoseUnits = .mgdL
         @Published var percentage: Decimal = 0
         @Published var threshold: Decimal = 0
         @Published var maxBolus: Decimal = 0

+ 1 - 1
FreeAPS/Sources/Modules/Calibrations/CalibrationsStateModel.swift

@@ -13,7 +13,7 @@ extension Calibrations {
         @Published var calibrate: (Double) -> Double = { $0 }
         @Published var items: [Item] = []
 
-        var units: GlucoseUnits = .mmolL
+        var units: GlucoseUnits = .mgdL
 
         // TODO: - test if we need to use the viewContext here
         private let context = CoreDataStack.shared.newTaskContext()

+ 1 - 1
FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift

@@ -23,7 +23,7 @@ extension DataTable {
         @Published var insulinEntryDeleted: Bool = false
         @Published var carbEntryDeleted: Bool = false
 
-        var units: GlucoseUnits = .mmolL
+        var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             units = settingsManager.settings.units

+ 1 - 1
FreeAPS/Sources/Modules/Dynamic/DynamicStateModel.swift

@@ -12,7 +12,7 @@ extension Dynamic {
         @Published var weightPercentage: Decimal = 0.65
         @Published var tddAdjBasal: Bool = false
         @Published var threshold_setting: Decimal = 65
-        @Published var unit: GlucoseUnits = .mmolL
+        @Published var unit: GlucoseUnits = .mgdL
 
         var preferences: Preferences {
             settingsManager.preferences

+ 1 - 1
FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -38,7 +38,7 @@ extension Home {
         @Published var bolusProgress: Decimal?
         @Published var eventualBG: Int?
         @Published var allowManualTemp = false
-        @Published var units: GlucoseUnits = .mmolL
+        @Published var units: GlucoseUnits = .mgdL
         @Published var pumpDisplayState: PumpDisplayState?
         @Published var alarm: GlucoseAlarm?
         @Published var animatedBackground = false

+ 2 - 2
FreeAPS/Sources/Modules/ISFEditor/ISFEditorProvider.swift

@@ -4,8 +4,8 @@ extension ISFEditor {
             storage.retrieve(OpenAPS.Settings.insulinSensitivities, as: InsulinSensitivities.self)
                 ?? InsulinSensitivities(from: OpenAPS.defaults(for: OpenAPS.Settings.insulinSensitivities))
                 ?? InsulinSensitivities(
-                    units: .mmolL,
-                    userPrefferedUnits: .mmolL,
+                    units: .mgdL,
+                    userPrefferedUnits: .mgdL,
                     sensitivities: []
                 )
         }

+ 1 - 1
FreeAPS/Sources/Modules/ISFEditor/ISFEditorStateModel.swift

@@ -29,7 +29,7 @@ extension ISFEditor {
             return lastItem.timeIndex < timeValues.count - 1
         }
 
-        private(set) var units: GlucoseUnits = .mmolL
+        private(set) var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             let profile = provider.profile

+ 1 - 1
FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift

@@ -28,7 +28,7 @@ extension NightscoutConfig {
         @Published var uploadGlucose = true // Upload Glucose
         @Published var useLocalSource = false
         @Published var localPort: Decimal = 0
-        @Published var units: GlucoseUnits = .mmolL
+        @Published var units: GlucoseUnits = .mgdL
         @Published var dia: Decimal = 6
         @Published var maxBasal: Decimal = 2
         @Published var maxBolus: Decimal = 10

+ 1 - 1
FreeAPS/Sources/Modules/NotificationsConfig/NotificationsConfigStateModel.swift

@@ -10,7 +10,7 @@ extension NotificationsConfig {
         @Published var highGlucose: Decimal = 0
         @Published var carbsRequiredThreshold: Decimal = 0
         @Published var useLiveActivity = false
-        var units: GlucoseUnits = .mmolL
+        var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             let units = settingsManager.settings.units

+ 1 - 1
FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesStateModel.swift

@@ -36,7 +36,7 @@ extension OverrideProfilesConfig {
         @Published var showOverrideEditSheet = false
         @Published var showInvalidTargetAlert = false
 
-        var units: GlucoseUnits = .mmolL
+        var units: GlucoseUnits = .mgdL
 
         // temp target stuff
         @Published var low: Decimal = 0

+ 1 - 1
FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift

@@ -8,7 +8,7 @@ extension PreferencesEditor {
         @Published var skipBolusScreenAfterCarbs = false
         @Published var sections: [FieldSection] = []
         @Published var useAlternativeBolusCalc: Bool = false
-        @Published var units: GlucoseUnits = .mmolL
+        @Published var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             preferences = provider.preferences

+ 1 - 1
FreeAPS/Sources/Modules/Stat/StatStateModel.swift

@@ -10,7 +10,7 @@ extension Stat {
         @Published var lowLimit: Decimal = 4 / 0.0555
         @Published var overrideUnit: Bool = false
         @Published var layingChart: Bool = false
-        @Published var units: GlucoseUnits = .mmolL
+        @Published var units: GlucoseUnits = .mgdL
         @Published var glucoseFromPersistence: [GlucoseStored] = []
 
         @Published var selectedDuration: Duration = .Today

+ 1 - 1
FreeAPS/Sources/Modules/StatConfig/StatConfigStateModel.swift

@@ -15,7 +15,7 @@ extension StatConfig {
         @Published var historyLayout: HistoryLayout = .twoTabs
         @Published var lockScreenView: LockScreenView = .simple
 
-        var units: GlucoseUnits = .mmolL
+        var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             let units = settingsManager.settings.units

+ 1 - 1
FreeAPS/Sources/Modules/TargetsEditor/TargetsEditorStateModel.swift

@@ -20,7 +20,7 @@ extension TargetsEditor {
             return lastItem.timeIndex < timeValues.count - 1
         }
 
-        private(set) var units: GlucoseUnits = .mmolL
+        private(set) var units: GlucoseUnits = .mgdL
 
         override func subscribe() {
             let profile = provider.profile