Skip to content

Restore pump status in Nightscout device status uploads #2

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

Closed
bjorkert wants to merge 1 commit into from
+24 −1
Closed

Restore pump status in Nightscout device status uploads #2

Show file tree
Hide file tree
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
19 changes: 18 additions & 1 deletion Loop/Managers/LoopDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ protocol DeliveryDelegate: AnyObject {
var pumpInsulinType: InsulinType? { get }
var basalDeliveryState: PumpManagerStatus.BasalDeliveryState? { get }
var isPumpConfigured: Bool { get }

var pumpManagerStatus: PumpManagerStatus? { get }
var pumpStatusHighlight: DeviceStatusHighlight? { get }
var cgmManagerStatus: CGMManagerStatus? { get }

func enact(bolus: Double?, tempBasal: TempBasalRecommendation?, decisionId: UUID?) async throws
func enactBolus(units: Double, decisionId: UUID?, activationType: BolusActivationType) async throws
func roundBasalRate(unitsPerHour: Double) -> Double
Expand Down Expand Up @@ -897,6 +900,18 @@ final class LoopDataManager: ObservableObject {
}

dosingDecision.controllerStatus = UIDevice.current.controllerStatus

// Device status for the Nightscout devicestatus.pump payload.
dosingDecision.pumpManagerStatus = deliveryDelegate?.pumpManagerStatus
if let pumpStatusHighlight = deliveryDelegate?.pumpStatusHighlight {
dosingDecision.pumpStatusHighlight = StoredDosingDecision.StoredDeviceHighlight(
localizedMessage: pumpStatusHighlight.localizedMessage,
imageName: pumpStatusHighlight.imageName,
state: pumpStatusHighlight.state)
}
dosingDecision.cgmManagerStatus = deliveryDelegate?.cgmManagerStatus
dosingDecision.lastReservoirValue = StoredDosingDecision.LastReservoirValue(doseStore.lastReservoirValue)

self.logger.debug("Manual bolus rec = %{public}@", String(describing: dosingDecision.manualBolusRecommendation))
await self.dosingDecisionStore.storeDosingDecision(dosingDecision)
}
Expand Down Expand Up @@ -1010,6 +1025,8 @@ extension LoopDataManager {
settings: StoredDosingDecision.Settings(settingsProvider.settings),
scheduleOverride: bolusDosingDecision.scheduleOverride,
controllerStatus: UIDevice.current.controllerStatus,
pumpManagerStatus: deliveryDelegate?.pumpManagerStatus,
cgmManagerStatus: deliveryDelegate?.cgmManagerStatus,
lastReservoirValue: StoredDosingDecision.LastReservoirValue(doseStore.lastReservoirValue),
historicalGlucose: bolusDosingDecision.historicalGlucose,
originalCarbEntry: bolusDosingDecision.originalCarbEntry,
Expand Down
6 changes: 6 additions & 0 deletions LoopTests/Mocks/MockDeliveryDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ class MockDeliveryDelegate: DeliveryDelegate {

var isPumpConfigured: Bool = true

var pumpManagerStatus: PumpManagerStatus?

var pumpStatusHighlight: DeviceStatusHighlight?

var cgmManagerStatus: CGMManagerStatus?

var lastEnact: (bolus: Double?, tempBasal: TempBasalRecommendation?)

func enact(bolus: Double?, tempBasal: TempBasalRecommendation?, decisionId: UUID?) async throws {
Expand Down