New way of handling cage/sage

LoopFollow/Controllers/Nightscout/CAge.swift

@@ -6,8 +6,6 @@
 //  Copyright © 2023 Jon Fawcett. All rights reserved.
 //
 
-//TODO: Någon bool för DeepCageSage som bara ska köras en ggn om data inte finns i vanliga Treatments
-
 import Foundation
 extension MainViewController {
     // NS Cage Web Call
@@ -38,6 +36,7 @@ extension MainViewController {
             return
         }
         
+        currentCage = data[0]
         let lastCageString = data[0].created_at
         
         let formatter = ISO8601DateFormatter()

LoopFollow/Controllers/Nightscout/SAge.swift

@@ -6,8 +6,6 @@
 //  Copyright © 2023 Jon Fawcett. All rights reserved.
 //
 
-//TODO: Någon bool för DeepCageSage som bara ska köras en ggn om data inte finns i vanliga Treatments
-
 import Foundation
 extension MainViewController {
     // NS Sage Web Call
@@ -41,7 +39,7 @@ extension MainViewController {
         if data.count == 0 {
             return
         }
-        
+        currentSage = data[0]
         var lastSageString = data[0].created_at
         
         let formatter = ISO8601DateFormatter()

LoopFollow/Controllers/Nightscout/Treatments/SensorStart.swift

@@ -11,10 +11,11 @@ extension MainViewController {
     func processSage(entries: [sageData]) {
         if !entries.isEmpty {
             updateSage(data: entries)
-        } else if mayDoDeepSageCheck {
+        } else if let sage = currentSage {
+            updateSage(data: [sage])
+        } else {
             webLoadNSSage()
         }
-        mayDoDeepSageCheck = false
     }
     
     // NS Sensor Start Response Processor

LoopFollow/Controllers/Nightscout/Treatments/SiteChange.swift

@@ -11,9 +11,10 @@ extension MainViewController {
     func processCage(entries: [cageData]) {
         if !entries.isEmpty {
             updateCage(data: entries)
-        } else if mayDoDeepCageCheck {
+        } else if let cage = currentCage {
+            updateCage(data: [cage])
+        } else {
             webLoadNSCage()
         }
-        mayDoDeepCageCheck = false
     }
 }

LoopFollow/ViewControllers/MainViewController.swift

@@ -70,8 +70,8 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     let consoleLogging = true
     var timeofLastBGUpdate = 0 as TimeInterval
     var nsVerifiedAlerted = false
-    var mayDoDeepSageCheck = true
-    var mayDoDeepCageCheck = true
+    var currentSage : sageData?
+    var currentCage : cageData?
 
     var backgroundTask = BackgroundTask()
     
@@ -266,8 +266,8 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         MinAgoText.text = "Refreshing"
         invalidateTimers()
         restartAllTimers()
-        mayDoDeepSageCheck = true
-        mayDoDeepCageCheck = true
+        currentCage = nil
+        currentSage = nil
         refreshControl.endRefreshing()
     }