Skip to content

Fix predicted BG graph only showing sometimes #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ps2 merged 1 commit into from
Aug 17, 2023
Merged

Fix predicted BG graph only showing sometimes #2046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Loop/Managers/LoopDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ final class LoopDataManager {
self.dataAccessQueue.async {
self.logger.default("Received notification of dosing changing")

self.insulinEffect = nil
self.clearCachedInsulinEffects()
self.remoteRecommendationNeedsUpdating = true

self.notify(forChange: .insulin)
Expand Down Expand Up @@ -314,7 +314,7 @@ final class LoopDataManager {
// Invalidate cached effects based on this schedule
self.carbEffect = nil
self.carbsOnBoard = nil
self.insulinEffect = nil
self.clearCachedInsulinEffects()
}
}

Expand All @@ -339,12 +339,7 @@ final class LoopDataManager {
}
}

private var insulinEffect: [GlucoseEffect]? {
didSet {
insulinEffectIncludingPendingInsulin = nil
predictedGlucose = nil
}
}
private var insulinEffect: [GlucoseEffect]?

private var insulinEffectIncludingPendingInsulin: [GlucoseEffect]? {
didSet {
Expand Down Expand Up @@ -454,6 +449,12 @@ final class LoopDataManager {

return cachedRetrospectiveCorrection!
}

func clearCachedInsulinEffects() {
insulinEffect = nil
insulinEffectIncludingPendingInsulin = nil
predictedGlucose = nil
}

// MARK: - Background task management

Expand Down Expand Up @@ -717,7 +718,7 @@ extension LoopDataManager {
self.logger.debug("bolusConfirmed")
self.lastRequestedBolus = nil
self.recommendedAutomaticDose = nil
self.insulinEffect = nil
self.clearCachedInsulinEffects()
self.notify(forChange: .insulin)

completion?()
Expand All @@ -733,7 +734,7 @@ extension LoopDataManager {
self.dataAccessQueue.async {
self.logger.debug("bolusRequestFailed")
self.lastRequestedBolus = nil
self.insulinEffect = nil
self.clearCachedInsulinEffects()
self.notify(forChange: .insulin)

completion?()
Expand All @@ -754,7 +755,7 @@ extension LoopDataManager {

self.dataAccessQueue.async {
if error == nil {
self.insulinEffect = nil
self.clearCachedInsulinEffects()
}
}
}
Expand All @@ -773,7 +774,7 @@ extension LoopDataManager {
doseStore.addDoses([dose], from: nil) { (error) in
if error == nil {
self.recommendedAutomaticDose = nil
self.insulinEffect = nil
self.clearCachedInsulinEffects()
self.notify(forChange: .insulin)
}
}
Expand All @@ -795,7 +796,7 @@ extension LoopDataManager {
completion(.failure(error))
} else if let newValue = newValue {
self.dataAccessQueue.async {
self.insulinEffect = nil
self.clearCachedInsulinEffects()

if let newDoseStartDate = previousValue?.startDate {
// Prune back any counteraction effects for recomputation, after the effect delay
Expand Down