Jon Fawcett преди 5 години
родител
ревизия
6e3d3cef99
променени са 2 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 5 1
      LoopFollow/Controllers/NightScout.swift
  2. 3 3
      LoopFollow/Controllers/Timers.swift

+ 5 - 1
LoopFollow/Controllers/NightScout.swift

@@ -193,6 +193,10 @@ extension MainViewController {
             if data.count > 0 {
                 self.updateBadge(val: data[data.count - 1].sgv)
             }
+            if self.bgTimer.isValid {
+                self.bgTimer.invalidate()
+            }
+            self.startBGTimer(time: 10)
             return
         }
         
@@ -600,7 +604,7 @@ extension MainViewController {
         // if the Loop is overdue: 5:00-6:59 re-attempt every 10 seconds
         } else if secondsAgo >= (5 * 60) {
             self.startDeviceStatusTimer(time: 10)
-            print("started 10 second bg timer")
+            print("started 10 second device status timer")
         
         // We have a current Loop. Set timer to 5:10 from last reading
         } else {

+ 3 - 3
LoopFollow/Controllers/Timers.swift

@@ -16,10 +16,10 @@ extension MainViewController {
         if !deviceStatusTimer.isValid { startDeviceStatusTimer(time: 1) }
         if !profileTimer.isValid { startProfileTimer(time: 1) }
         if !bgTimer.isValid { startBGTimer(time: 1) }
-        if !treatmentsTimer.isValid { startTreatmentsTimer(time: 10) }
-        if !cageSageTimer.isValid { startCageSageTimer(time: 10) }
+        if !treatmentsTimer.isValid { startTreatmentsTimer(time: 1) }
+        if !cageSageTimer.isValid { startCageSageTimer(time: 1) }
         if !minAgoTimer.isValid { startMinAgoTimer(time: minAgoTimeInterval) }
-        if !calendarTimer.isValid { startCalendarTimer(time: 30) }
+        if !calendarTimer.isValid { startCalendarTimer(time: 15) }
         if !alarmTimer.isValid { startAlarmTimer(time: 30) }
     }