Skip to content

Tidepool Sync #8

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
merged 2 commits into from
Sep 22, 2023
Merged

Tidepool Sync #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90bc8bc
[COASTAL-1291] update for pluggable protocol (#5)
nhamming Sep 19, 2023
9d28bb4
Merge tidepool/main
ps2 Sep 22, 2023
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
18 changes: 7 additions & 11 deletions MinimedKit/PumpManager/MinimedPumpManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,18 @@ public protocol MinimedPumpManagerStateObserver: AnyObject {

public class MinimedPumpManager: RileyLinkPumpManager {

public static let managerIdentifier = "Minimed500"
public static let pluginIdentifier = "Minimed500"

// Primarily used for testing
public let dateGenerator: () -> Date

public var managerIdentifier: String {
return MinimedPumpManager.managerIdentifier
}


public init(state: MinimedPumpManagerState, rileyLinkDeviceProvider: RileyLinkDeviceProvider, pumpOps: PumpOps? = nil, dateGenerator: @escaping () -> Date = Date.init) {
self.lockedState = Locked(state)

self.dateGenerator = dateGenerator

self.hkDevice = HKDevice(
name: MinimedPumpManager.managerIdentifier,
name: MinimedPumpManager.pluginIdentifier,
manufacturer: "Medtronic",
model: state.pumpModel.rawValue,
hardwareVersion: nil,
Expand Down Expand Up @@ -265,7 +261,7 @@ public class MinimedPumpManager: RileyLinkPumpManager {
state.lastRileyLinkBatteryAlertDate = dateGenerator()
}
self.pumpDelegate.notify { delegate in
let identifier = Alert.Identifier(managerIdentifier: self.managerIdentifier, alertIdentifier: "lowRLBattery")
let identifier = Alert.Identifier(managerIdentifier: self.pluginIdentifier, alertIdentifier: "lowRLBattery")
let alertBody = String(format: LocalizedString("\"%1$@\" has a low battery", comment: "Format string for low battery alert body for RileyLink. (1: device name)"), device.name ?? "unnamed")
let content = Alert.Content(title: LocalizedString("Low RileyLink Battery", comment: "Title for RileyLink low battery alert"), body: alertBody, acknowledgeActionButtonLabel: LocalizedString("OK", comment: "Acknowledge button label for RileyLink low battery alert"))
delegate?.issueAlert(Alert(identifier: identifier, foregroundContent: content, backgroundContent: content, trigger: .immediate))
Expand Down Expand Up @@ -493,7 +489,7 @@ extension MinimedPumpManager {
}

private static var pumpBatteryLowAlertIdentifier: Alert.Identifier {
return Alert.Identifier(managerIdentifier: managerIdentifier, alertIdentifier: "PumpBatteryLow")
return Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "PumpBatteryLow")
}

private var pumpBatteryLowAlert: Alert {
Expand Down Expand Up @@ -558,7 +554,7 @@ extension MinimedPumpManager {
}

private static var pumpReservoirEmptyAlertIdentifier: Alert.Identifier {
return Alert.Identifier(managerIdentifier: managerIdentifier, alertIdentifier: "PumpReservoirEmpty")
return Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "PumpReservoirEmpty")
}

private var pumpReservoirEmptyAlert: Alert {
Expand All @@ -569,7 +565,7 @@ extension MinimedPumpManager {
}

private static var pumpReservoirLowAlertIdentifier: Alert.Identifier {
return Alert.Identifier(managerIdentifier: managerIdentifier, alertIdentifier: "PumpReservoirLow")
return Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "PumpReservoirLow")
}

private func pumpReservoirLowAlertForAmount(_ units: Double, andTimeRemaining remaining: TimeInterval?) -> Alert {
Expand Down
2 changes: 1 addition & 1 deletion MinimedKitUI/MinimedHUDProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import SwiftUI
class MinimedHUDProvider: HUDProvider {

var managerIdentifier: String {
return MinimedPumpManager.managerIdentifier
return MinimedPumpManager.pluginIdentifier
}

private var state: MinimedPumpManagerState {
Expand Down