Only fetch 5 devicestatus if last attempt resulted in suggested

loopandlearn · Jan 26, 2025 · a819fe1 · a819fe1
1 parent 4aa0029
commit a819fe1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/LoopFollow/Controllers/Nightscout/DeviceStatus.swift b/LoopFollow/Controllers/Nightscout/DeviceStatus.swift
@@ -13,8 +13,10 @@ import Charts
 extension MainViewController {
     // NS Device Status Web Call
     func webLoadNSDeviceStatus() {
-        let count = ObservableUserDefaults.shared.device.value == "Trio" ? "5" : "1"
-        LogManager.shared.log(category: .deviceStatus, message: "Fetching \(count) device status records", isDebug: true)
+        let count = ObservableUserDefaults.shared.device.value == "Trio" && Observable.shared.isLastDeviceStatusSuggested.value ? "5" : "1"
+        if count != "1" {
+            LogManager.shared.log(category: .deviceStatus, message: "Fetching \(count) device status records")
+        }
 
         let parameters: [String: String] = ["count": count]
         NightscoutUtils.executeDynamicRequest(eventType: .deviceStatus, parameters: parameters) { result in

diff --git a/LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift b/LoopFollow/Controllers/Nightscout/DeviceStatusOpenAPS.swift
@@ -31,6 +31,8 @@ extension MainViewController {
                     wasEnacted = false
                 }
 
+                Observable.shared.isLastDeviceStatusSuggested.value = !wasEnacted
+
                 if wasEnacted {
                     UserDefaultsRepository.alertLastLoopTime.value = lastLoopTime
                     LogManager.shared.log(category: .deviceStatus, message: "New LastLoopTime: \(lastLoopTime)", isDebug: true)

diff --git a/LoopFollow/Storage/Observable.swift b/LoopFollow/Storage/Observable.swift
@@ -14,6 +14,7 @@ class Observable {
 
     var tempTarget = ObservableValue<HKQuantity?>(default: nil)
     var override = ObservableValue<String?>(default: nil)
+    var isLastDeviceStatusSuggested = ObservableValue<Bool>(default: false)
 
     private init() {}
 }