Jon Mårtensson 3 년 전
부모
커밋
a48150bcc9
3개의 변경된 파일2개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 2
      FreeAPS/Sources/APS/APSManager.swift
  2. 1 1
      FreeAPS/Sources/APS/OpenAPS/Constants.swift
  3. 0 4
      FreeAPS/Sources/Models/Statistics.swift

+ 1 - 2
FreeAPS/Sources/APS/APSManager.swift

@@ -1080,7 +1080,7 @@ final class BaseAPSManager: APSManager, Injectable {
             avg_duration: Decimal(roundDouble(averageLoopTime, 2)),
             avg_duration: Decimal(roundDouble(averageLoopTime, 2)),
             median_duration: Decimal(roundDouble(medianLoopTime, 2)),
             median_duration: Decimal(roundDouble(medianLoopTime, 2)),
             min_duration: roundDecimal(Decimal(minimumLoopTime), 2),
             min_duration: roundDecimal(Decimal(minimumLoopTime), 2),
-            max_duration: Decimal(roundDouble(maximumLoopTime , 1))
+            max_duration: Decimal(roundDouble(maximumLoopTime, 1))
         )
         )
 
 
         // TIR calcs for every case
         // TIR calcs for every case
@@ -1201,7 +1201,6 @@ final class BaseAPSManager: APSManager, Injectable {
             peakActivityTime: iPa,
             peakActivityTime: iPa,
             Carbs_24h: carbTotal,
             Carbs_24h: carbTotal,
             GlucoseStorage_Days: Decimal(daysBG),
             GlucoseStorage_Days: Decimal(daysBG),
-            TimeOfComputation: Decimal(-1 * roundDouble(statisticsStartedAt.timeIntervalSinceNow, 1)),
             Statistics: Stats(
             Statistics: Stats(
                 Distribution: TimeInRange,
                 Distribution: TimeInRange,
                 Glucose: avg,
                 Glucose: avg,

+ 1 - 1
FreeAPS/Sources/APS/OpenAPS/Constants.swift

@@ -59,7 +59,7 @@ extension OpenAPS {
         static let alertHistory = "monitor/alerthistory.json"
         static let alertHistory = "monitor/alerthistory.json"
         static let statistics = "monitor/statistics.json"
         static let statistics = "monitor/statistics.json"
         static let loopStats = "monitor/loopStats.json"
         static let loopStats = "monitor/loopStats.json"
-        static let glucose_data = "monitor/glucose_date.json"
+        static let glucose_data = "monitor/glucose_data.json"
     }
     }
 
 
     enum Enact {
     enum Enact {

+ 0 - 4
FreeAPS/Sources/Models/Statistics.swift

@@ -17,7 +17,6 @@ struct Statistics: JSON, Equatable {
     var peakActivityTime: Decimal
     var peakActivityTime: Decimal
     var Carbs_24h: Decimal
     var Carbs_24h: Decimal
     var GlucoseStorage_Days: Decimal
     var GlucoseStorage_Days: Decimal
-    var TimeOfComputation: Decimal
     var Statistics: Stats
     var Statistics: Stats
 
 
     init(
     init(
@@ -37,7 +36,6 @@ struct Statistics: JSON, Equatable {
         peakActivityTime: Decimal,
         peakActivityTime: Decimal,
         Carbs_24h: Decimal,
         Carbs_24h: Decimal,
         GlucoseStorage_Days: Decimal,
         GlucoseStorage_Days: Decimal,
-        TimeOfComputation: Decimal,
         Statistics: Stats
         Statistics: Stats
     ) {
     ) {
         self.created_at = created_at
         self.created_at = created_at
@@ -56,7 +54,6 @@ struct Statistics: JSON, Equatable {
         self.peakActivityTime = peakActivityTime
         self.peakActivityTime = peakActivityTime
         self.Carbs_24h = Carbs_24h
         self.Carbs_24h = Carbs_24h
         self.GlucoseStorage_Days = GlucoseStorage_Days
         self.GlucoseStorage_Days = GlucoseStorage_Days
-        self.TimeOfComputation = TimeOfComputation
         self.Statistics = Statistics
         self.Statistics = Statistics
     }
     }
 
 
@@ -87,7 +84,6 @@ extension Statistics {
         case peakActivityTime
         case peakActivityTime
         case Carbs_24h
         case Carbs_24h
         case GlucoseStorage_Days
         case GlucoseStorage_Days
-        case TimeOfComputation
         case Statistics
         case Statistics
     }
     }
 }
 }