Merge remote-tracking branch 'ivalkou/dev' into Crowdin

FreeAPS/Resources/javascript/prepare/meal.js

@@ -25,7 +25,7 @@ function generate(pumphistory_data, profile_data, clock_data, glucose_data, basa
 
     var recentCarbs = freeaps_meal(inputs);
 
-    if (glucose_data.length < 36) {
+    if (glucose_data.length < 4) {
         console.error("Not enough glucose data to calculate carb absorption; found:", glucose_data.length);
         recentCarbs.mealCOB = 0;
         recentCarbs.reason = "not enough glucose data to calculate carb absorption";

FreeAPS/Sources/APS/APSManager.swift

@@ -211,7 +211,7 @@ final class BaseAPSManager: APSManager, Injectable {
 
     func determineBasal() -> AnyPublisher<Bool, Never> {
         debug(.apsManager, "Start determine basal")
-        guard let glucose = storage.retrieve(OpenAPS.Monitor.glucose, as: [BloodGlucose].self), glucose.count >= 36 else {
+        guard let glucose = storage.retrieve(OpenAPS.Monitor.glucose, as: [BloodGlucose].self), glucose.isNotEmpty else {
             debug(.apsManager, "Not enough glucose data")
             processError(APSError.glucoseError(message: "Not enough glucose data"))
             return Just(false).eraseToAnyPublisher()

FreeAPS/Sources/APS/DeviceDataManager.swift

@@ -166,17 +166,18 @@ final class BaseDeviceDataManager: DeviceDataManager, Injectable {
             return Just([]).eraseToAnyPublisher()
         }
 
-        medtronic.cgmManagerDelegate = self
-
-        guard lastFetchGlucoseDate.addingTimeInterval(4.5 * 60) < Date() else {
+        guard lastFetchGlucoseDate.addingTimeInterval(5.minutes.timeInterval) < Date() else {
             return Just([]).eraseToAnyPublisher()
         }
 
+        medtronic.cgmManagerDelegate = self
+
         return Future<[BloodGlucose], Error> { promise in
             self.processQueue.async {
                 medtronic.fetchNewDataIfNeeded { result in
                     switch result {
                     case .noData:
+                        debug(.deviceManager, "Minilink glucose is empty")
                         promise(.success([]))
                     case let .newData(glucose):
                         let directions: [BloodGlucose.Direction?] = [nil]

FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -380,7 +380,6 @@ extension MainChartView {
         calculateBolusDots(fullSize: fullSize)
         calculateCarbsDots(fullSize: fullSize)
         calculateTempTargetsRects(fullSize: fullSize)
-        calculateTempTargetsRects(fullSize: fullSize)
         calculateBasalPoints(fullSize: fullSize)
         calculateSuspensions(fullSize: fullSize)
     }
@@ -800,10 +799,7 @@ extension MainChartView {
     }
 
     private func timeToXCoordinate(_ time: TimeInterval, fullSize: CGSize) -> CGFloat {
-        let xOffset = -(
-            glucose.first?.dateString.timeIntervalSince1970 ?? Date()
-                .addingTimeInterval(-1.days.timeInterval).timeIntervalSince1970
-        )
+        let xOffset = -Date().addingTimeInterval(-1.days.timeInterval).timeIntervalSince1970
         let stepXFraction = fullGlucoseWidth(viewWidth: fullSize.width) / CGFloat(hours.hours.timeInterval)
         let x = CGFloat(time + xOffset) * stepXFraction
         return x