Quellcode durchsuchen

Release/0.1.5 (#14)

* Fix ISF configuration screen
Ivan vor 5 Jahren
Ursprung
Commit
31844bdfe3

+ 1 - 1
FreeAPS/Resources/Config.xcconfig

@@ -1 +1 @@
-BUILD_VERSION = 0.1.4
+BUILD_VERSION = 0.1.5

+ 1 - 1
FreeAPS/Sources/APS/Storage/CarbsStorage.swift

@@ -65,7 +65,7 @@ final class BaseCarbsStorage: CarbsStorage, Injectable {
                 rate: nil,
                 eventType: .nsCarbCorrection,
                 createdAt: $0.createdAt,
-                entededBy: CarbsEntry.manual,
+                enteredBy: CarbsEntry.manual,
                 bolus: nil,
                 insulin: nil,
                 notes: nil,

+ 3 - 3
FreeAPS/Sources/APS/Storage/PumpHistoryStorage.swift

@@ -191,7 +191,7 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
                     rate: event.rate,
                     eventType: .nsTempBasal,
                     createdAt: event.timestamp,
-                    entededBy: NigtscoutTreatment.local,
+                    enteredBy: NigtscoutTreatment.local,
                     bolus: nil,
                     insulin: nil,
                     notes: nil,
@@ -221,7 +221,7 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
                     rate: nil,
                     eventType: .bolus,
                     createdAt: event.timestamp,
-                    entededBy: NigtscoutTreatment.local,
+                    enteredBy: NigtscoutTreatment.local,
                     bolus: event,
                     insulin: event.amount,
                     notes: nil,
@@ -238,7 +238,7 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
                     rate: nil,
                     eventType: .nsCarbCorrection,
                     createdAt: event.timestamp,
-                    entededBy: NigtscoutTreatment.local,
+                    enteredBy: NigtscoutTreatment.local,
                     bolus: nil,
                     insulin: nil,
                     notes: nil,

+ 1 - 1
FreeAPS/Sources/APS/Storage/TempTargetsStorage.swift

@@ -85,7 +85,7 @@ final class BaseTempTargetsStorage: TempTargetsStorage, Injectable {
                 rate: nil,
                 eventType: .nsTempTarget,
                 createdAt: $0.createdAt,
-                entededBy: TempTarget.manual,
+                enteredBy: TempTarget.manual,
                 bolus: nil,
                 insulin: nil,
                 notes: nil,

+ 2 - 2
FreeAPS/Sources/Models/NightscoutTreatment.swift

@@ -8,7 +8,7 @@ struct NigtscoutTreatment: JSON, Hashable, Equatable {
     var rate: Decimal?
     var eventType: EventType
     var createdAt: Date?
-    var entededBy: String?
+    var enteredBy: String?
     var bolus: PumpHistoryEvent?
     var insulin: Decimal?
     var notes: String?
@@ -38,7 +38,7 @@ extension NigtscoutTreatment {
         case rate
         case eventType
         case createdAt = "created_at"
-        case entededBy
+        case enteredBy
         case bolus
         case insulin
         case notes

+ 8 - 8
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -86,21 +86,21 @@ extension Home {
                         .padding(.leading, 8)
                 }
 
-                if let tepmTarget = viewModel.tempTarget {
-                    Text(tepmTarget.name).font(.caption).foregroundColor(.secondary)
+                if let tempTarget = viewModel.tempTarget {
+                    Text(tempTarget.name).font(.caption).foregroundColor(.secondary)
                     if viewModel.units == .mmolL {
                         Text(
                             targetFormatter
-                                .string(from: tepmTarget.targetBottom.asMmolL as NSNumber)!
+                                .string(from: tempTarget.targetBottom.asMmolL as NSNumber)!
                         )
                         .font(.caption)
                         .foregroundColor(.secondary)
-                        if tepmTarget.targetBottom != tepmTarget.targetTop {
+                        if tempTarget.targetBottom != tempTarget.targetTop {
                             Text("-").font(.caption)
                                 .foregroundColor(.secondary)
                             Text(
                                 targetFormatter
-                                    .string(from: tepmTarget.targetTop.asMmolL as NSNumber)! + " \(viewModel.units.rawValue)"
+                                    .string(from: tempTarget.targetTop.asMmolL as NSNumber)! + " \(viewModel.units.rawValue)"
                             )
                             .font(.caption)
                             .foregroundColor(.secondary)
@@ -110,13 +110,13 @@ extension Home {
                         }
 
                     } else {
-                        Text(targetFormatter.string(from: tepmTarget.targetBottom as NSNumber)!)
+                        Text(targetFormatter.string(from: tempTarget.targetBottom as NSNumber)!)
                             .font(.caption)
                             .foregroundColor(.secondary)
-                        if tepmTarget.targetBottom != tepmTarget.targetTop {
+                        if tempTarget.targetBottom != tempTarget.targetTop {
                             Text("-").font(.caption)
                                 .foregroundColor(.secondary)
-                            Text(targetFormatter.string(from: tepmTarget.targetTop as NSNumber)! + " \(viewModel.units.rawValue)")
+                            Text(targetFormatter.string(from: tempTarget.targetTop as NSNumber)! + " \(viewModel.units.rawValue)")
                                 .font(.caption)
                                 .foregroundColor(.secondary)
                         } else {

+ 9 - 9
FreeAPS/Sources/Modules/ISFEditor/ISFEditorViewModel.swift

@@ -4,18 +4,18 @@ extension ISFEditor {
     class ViewModel<Provider>: BaseViewModel<Provider>, ObservableObject where Provider: ISFEditorProvider {
         @Injected() var settingsManager: SettingsManager!
         @Published var items: [Item] = []
-        private(set) var autosensISF: Double?
-        private(set) var autosensRatio: Double = 0
+        private(set) var autosensISF: Decimal?
+        private(set) var autosensRatio: Decimal = 0
         @Published var autotune: Autotune?
 
         let timeValues = stride(from: 0.0, to: 1.days.timeInterval, by: 30.minutes.timeInterval).map { $0 }
 
-        var rateValues: [Double] {
+        var rateValues: [Decimal] {
             switch units {
             case .mgdL:
                 return stride(from: 9, to: 540.01, by: 1.0).map { $0 }
             case .mmolL:
-                return stride(from: 0.5, to: 30.01, by: 0.1).map { $0 }
+                return stride(from: 0.1, to: 30.01, by: 0.1).map { $0 }
             }
         }
 
@@ -31,7 +31,7 @@ extension ISFEditor {
             units = profile.units
             items = profile.sensitivities.map { value in
                 let timeIndex = timeValues.firstIndex(of: Double(value.offset * 60)) ?? 0
-                let rateIndex = rateValues.firstIndex(of: Double(value.sensitivity)) ?? 0
+                let rateIndex = rateValues.firstIndex(of: value.sensitivity) ?? 0
                 return Item(rateIndex: rateIndex, timeIndex: timeIndex)
             }
             autotune = provider.autotune
@@ -39,13 +39,13 @@ extension ISFEditor {
             if let newISF = provider.autosense.newisf {
                 switch units {
                 case .mgdL:
-                    autosensISF = Double(newISF)
+                    autosensISF = newISF
                 case .mmolL:
-                    autosensISF = round(Double(newISF * GlucoseUnits.exchangeRate) * 10) / 10
+                    autosensISF = newISF * GlucoseUnits.exchangeRate
                 }
             }
 
-            autosensRatio = Double(provider.autosense.ratio)
+            autosensRatio = provider.autosense.ratio
         }
 
         func add() {
@@ -68,7 +68,7 @@ extension ISFEditor {
                 fotmatter.dateFormat = "HH:mm:ss"
                 let date = Date(timeIntervalSince1970: self.timeValues[item.timeIndex])
                 let minutes = Int(date.timeIntervalSince1970 / 60)
-                let rate = Decimal(self.rateValues[item.rateIndex])
+                let rate = self.rateValues[item.rateIndex]
                 return InsulinSensitivityEntry(sensitivity: rate, offset: minutes, start: fotmatter.string(from: date))
             }
             let profile = InsulinSensitivities(