Skip to content

Avoid resetting rl config during mysentry pair on x23 #445

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
Sep 2, 2018
Merged

Avoid resetting rl config during mysentry pair on x23 #445

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
4 changes: 2 additions & 2 deletions MinimedKit/PumpManager/MinimedPumpManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import os.log
public class MinimedPumpManager: RileyLinkPumpManager, PumpManager {
public static let managerIdentifier: String = "Minimed500"

public init(state: MinimedPumpManagerState, rileyLinkDeviceProvider: RileyLinkDeviceProvider, rileyLinkConnectionManager: RileyLinkConnectionManager? = nil) {
public init(state: MinimedPumpManagerState, rileyLinkDeviceProvider: RileyLinkDeviceProvider, rileyLinkConnectionManager: RileyLinkConnectionManager? = nil, pumpOps: PumpOps? = nil) {
self.state = state

super.init(rileyLinkDeviceProvider: rileyLinkDeviceProvider, rileyLinkConnectionManager: rileyLinkConnectionManager)

// Pump communication
let idleListeningEnabled = state.pumpModel.hasMySentry
self.pumpOps = PumpOps(pumpSettings: state.pumpSettings, pumpState: state.pumpState, delegate: self)
self.pumpOps = pumpOps ?? PumpOps(pumpSettings: state.pumpSettings, pumpState: state.pumpState, delegate: self)

self.rileyLinkDeviceProvider.idleListeningState = idleListeningEnabled ? MinimedPumpManagerState.idleListeningEnabledDefaults : .disabled
}
Expand Down
4 changes: 2 additions & 2 deletions MinimedKitUI/Setup/MinimedPumpIDSetupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ class MinimedPumpIDSetupViewController: SetupTableViewController {
return MinimedPumpManager(
state: pumpManagerState,
rileyLinkDeviceProvider: rileyLinkPumpManager.rileyLinkDeviceProvider,
rileyLinkConnectionManager: rileyLinkPumpManager.rileyLinkConnectionManager)
rileyLinkConnectionManager: rileyLinkPumpManager.rileyLinkConnectionManager,
pumpOps: self.pumpOps)
}

// MARK: -
Expand Down Expand Up @@ -182,7 +183,6 @@ class MinimedPumpIDSetupViewController: SetupTableViewController {
footerView.primaryButton.setConnectTitle()
lastError = nil
case .completed:
pumpOps = nil
pumpIDTextField.isEnabled = true
activityIndicator.state = .completed
footerView.primaryButton.isEnabled = true
Expand Down
9 changes: 0 additions & 9 deletions RileyLinkKit/PumpOpsSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,15 +711,6 @@ extension PumpOpsSession {
/// - PumpOpsError.unexpectedResponse
/// - PumpOpsError.unknownResponse
public func changeWatchdogMarriageProfile(_ watchdogID: Data) throws {
try setRXFilterMode(.wide)
defer {
do {
try configureRadio(for: settings.pumpRegion)
} catch {
// Best effort resetting radio filter mode
}
}

let commandTimeout = TimeInterval(seconds: 30)

// Wait for the pump to start polling
Expand Down