modify artificial gap to 1 minute for overlapping overrides, add comments

marionbarker · marionbarker · commit cdc9684a456d · 2025-05-19T13:40:16.000-07:00
diff --git a/LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift b/LoopFollow/Controllers/Nightscout/Treatments/Overrides.swift
@@ -45,12 +45,12 @@ extension MainViewController {
                let nextStart   = NightscoutUtils.parseDate(nextDateStr)?
                 .timeIntervalSince1970
             {
-                end = min(end, nextStart - 300)
+                end = min(end, nextStart - 60) // avoid overlapping overrides
             }
 
             end = min(end, maxEndDate)
 
-            if end - start < 300 { continue }
+            if end - start < 300 { continue } // skip short overrides
 
             let dot = DataStructs.overrideStruct(
                 insulNeedsScaleFactor: e["insulinNeedsScaleFactor"] as? Double ?? 1,

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ extension MainViewController {`
`45`	`45`	`let nextStart = NightscoutUtils.parseDate(nextDateStr)?`
`46`	`46`	`.timeIntervalSince1970`
`47`	`47`	`{`
`48`		`- end = min(end, nextStart - 300)`
	`48`	`+ end = min(end, nextStart - 60) // avoid overlapping overrides`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`end = min(end, maxEndDate)`
`52`	`52`
`53`		`- if end - start < 300 { continue }`
	`53`	`+ if end - start < 300 { continue } // skip short overrides`
`54`	`54`
`55`	`55`	`let dot = DataStructs.overrideStruct(`
`56`	`56`	`insulNeedsScaleFactor: e["insulinNeedsScaleFactor"] as? Double ?? 1,`