Procházet zdrojové kódy

smooth value - Allows to upload to NS

Change the variable to store unsmoothed value and to leave the SGV value used by Nightscout
Pierre L před 3 roky
rodič
revize
34a4bc204e

+ 1 - 1
FreeAPS/Sources/APS/CGM/AppGroupSource.swift

@@ -69,7 +69,7 @@ struct AppGroupSource: GlucoseSource {
                     direction: BloodGlucose.Direction(rawValue: direction),
                     date: Decimal(Int(date.timeIntervalSince1970 * 1000)),
                     dateString: date,
-                    unfiltered: nil,
+                    unfiltered: Decimal(glucose),
                     filtered: nil,
                     noise: nil,
                     glucose: glucose,

+ 1 - 1
FreeAPS/Sources/APS/CGM/DexcomSourceG5.swift

@@ -153,7 +153,7 @@ extension DexcomSourceG5: CGMManagerDelegate {
                     direction: .init(trendType: newGlucoseSample.trend),
                     date: Decimal(Int(newGlucoseSample.date.timeIntervalSince1970 * 1000)),
                     dateString: newGlucoseSample.date,
-                    unfiltered: nil,
+                    unfiltered: Decimal(value),
                     filtered: nil,
                     noise: nil,
                     glucose: value,

+ 1 - 1
FreeAPS/Sources/APS/CGM/DexcomSourceG6.swift

@@ -154,7 +154,7 @@ extension DexcomSourceG6: CGMManagerDelegate {
                     direction: .init(trendType: newGlucoseSample.trend),
                     date: Decimal(Int(newGlucoseSample.date.timeIntervalSince1970 * 1000)),
                     dateString: newGlucoseSample.date,
-                    unfiltered: nil,
+                    unfiltered: Decimal(value),
                     filtered: nil,
                     noise: nil,
                     glucose: value,

+ 1 - 1
FreeAPS/Sources/APS/CGM/GlucoseSimulatorSource.swift

@@ -140,7 +140,7 @@ class IntelligentGenerator: BloodGlucoseGenerator {
             direction: BloodGlucose.Direction(rawValue: trandsStepDirection),
             date: Decimal(Int(date.timeIntervalSince1970) * 1000),
             dateString: date,
-            unfiltered: nil,
+            unfiltered: Decimal(currentGlucose),
             filtered: nil,
             noise: nil,
             glucose: currentGlucose,

+ 1 - 1
FreeAPS/Sources/APS/CGM/dexcomSourceG7.swift

@@ -144,7 +144,7 @@ extension DexcomSourceG7: CGMManagerDelegate {
                     direction: .init(trendType: newGlucoseSample.trend),
                     date: Decimal(Int(newGlucoseSample.date.timeIntervalSince1970 * 1000)),
                     dateString: newGlucoseSample.date,
-                    unfiltered: nil,
+                    unfiltered: Decimal(value),
                     filtered: nil,
                     noise: nil,
                     glucose: value,

+ 1 - 1
FreeAPS/Sources/APS/DeviceDataManager.swift

@@ -264,7 +264,7 @@ final class BaseDeviceDataManager: DeviceDataManager, Injectable {
                                 direction: directions[index],
                                 date: Decimal(Int(sample.date.timeIntervalSince1970 * 1000)),
                                 dateString: sample.date,
-                                unfiltered: nil,
+                                unfiltered: Decimal(value),
                                 filtered: nil,
                                 noise: nil,
                                 glucose: value,

+ 1 - 0
FreeAPS/Sources/Models/BloodGlucose.swift

@@ -87,6 +87,7 @@ extension BloodGlucose: SavitzkyGolaySmoothable {
         }
         set {
             glucose = Int(newValue)
+            sgv = Int(newValue)
         }
     }
 }

+ 2 - 1
FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -922,7 +922,8 @@ extension MainChartView {
 
     private func UnSmoothedGlucoseToCoordinate(_ glucoseEntry: BloodGlucose, fullSize: CGSize) -> CGPoint {
         let x = timeToXCoordinate(glucoseEntry.dateString.timeIntervalSince1970, fullSize: fullSize)
-        let y = glucoseToYCoordinate(glucoseEntry.sgv ?? glucoseEntry.glucose ?? 0, fullSize: fullSize)
+        let glucoseValue: Decimal = glucoseEntry.unfiltered ?? Decimal(glucoseEntry.glucose ?? 0)
+        let y = glucoseToYCoordinate(Int(glucoseValue), fullSize: fullSize)
 
         return CGPoint(x: x, y: y)
     }

+ 1 - 1
FreeAPS/Sources/Services/HealthKit/HealthKitManager.swift

@@ -451,7 +451,7 @@ final class BaseHealthKitManager: HealthKitManager, Injectable, CarbsObserver {
                     direction: nil,
                     date: Decimal(Int(sample.date.timeIntervalSince1970) * 1000),
                     dateString: sample.date,
-                    unfiltered: nil,
+                    unfiltered: Decimal(sample.glucose),
                     filtered: nil,
                     noise: nil,
                     glucose: sample.glucose,