Skip to content

proceed to control after bond request #74

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 1 commit into from
Feb 23, 2018
Merged

proceed to control after bond request #74

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
17 changes: 10 additions & 7 deletions xDripG5/Transmitter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,10 @@ public final class Transmitter: BluetoothManagerDelegate {
try peripheral.requestBond()

self.log.info("Bonding request sent. Waiting user to respond.")
} else {
let glucose = try peripheral.control()
self.delegateQueue.async {
self.delegate?.transmitter(self, didRead: glucose)
}
}
let glucose = try peripheral.control(shouldWaitForBond: status.bonded != 0x1)
self.delegateQueue.async {
self.delegate?.transmitter(self, didRead: glucose)
}
} catch let error {
self.delegateQueue.async {
Expand Down Expand Up @@ -257,9 +256,13 @@ fileprivate extension PeripheralManager {
}
}

fileprivate func control() throws -> Glucose {
fileprivate func control(shouldWaitForBond: Bool = false) throws -> Glucose {
do {
try setNotifyValue(true, for: .control)
if shouldWaitForBond {
try setNotifyValue(true, for: .control, timeout: 15)
} else {
try setNotifyValue(true, for: .control)
}
} catch let error {
throw TransmitterError.controlError("Error enabling notification: \(error)")
}
Expand Down