Skip to content
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

Jump to bottom

G6 update hotfix #128

Merged
merged 3 commits into from
Jul 18, 2019
Merged

G6 update hotfix #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01bda8b
Delay control subscription until after auth (#127)
ps2 Jul 15, 2019
056a135
Bump LoopKit rev
ps2 Jul 15, 2019
3281ec9
Bump version
ps2 Jul 15, 2019
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
2 changes: 1 addition & 1 deletion CGMBLEKit Example/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
12 changes: 6 additions & 6 deletions CGMBLEKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 20;
DYLIB_CURRENT_VERSION = 21;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1335,7 +1335,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 20;
DYLIB_CURRENT_VERSION = 21;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1387,7 +1387,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20;
CURRENT_PROJECT_VERSION = 21;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -1457,7 +1457,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 20;
CURRENT_PROJECT_VERSION = 21;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -1496,7 +1496,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 20;
DYLIB_CURRENT_VERSION = 21;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1523,7 +1523,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 20;
DYLIB_CURRENT_VERSION = 21;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
11 changes: 10 additions & 1 deletion CGMBLEKit/BluetoothManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ protocol BluetoothManagerDelegate: class {
/// - manager: The bluetooth manager
/// - response: The data received on the backfill characteristic
func bluetoothManager(_ manager: BluetoothManager, didReceiveBackfillResponse response: Data)

/// Informs the delegate that the bluetooth manager received new data in the authentication characteristic
///
/// - Parameters:
/// - manager: The bluetooth manager
/// - response: The data received on the authentication characteristic
func bluetoothManager(_ manager: BluetoothManager, peripheralManager: PeripheralManager, didReceiveAuthenticationResponse response: Data)
}


Expand Down Expand Up @@ -318,12 +325,14 @@ extension BluetoothManager: PeripheralManagerDelegate {
}

switch CGMServiceCharacteristicUUID(rawValue: characteristic.uuid.uuidString.uppercased()) {
case .none, .communication?, .authentication?:
case .none, .communication?:
return
case .control?:
self.delegate?.bluetoothManager(self, didReceiveControlResponse: value)
case .backfill?:
self.delegate?.bluetoothManager(self, didReceiveBackfillResponse: value)
case .authentication?:
self.delegate?.bluetoothManager(self, peripheralManager: manager, didReceiveAuthenticationResponse: value)
}
}
}
11 changes: 10 additions & 1 deletion CGMBLEKit/BluetoothServices.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,24 @@ enum DeviceInfoCharacteristicUUID: String, CBUUIDRawValue {


enum CGMServiceCharacteristicUUID: String, CBUUIDRawValue {

// Read/Notify
case communication = "F8083533-849E-531C-C594-30F1F86A4EA5"

// Write/Indicate
case control = "F8083534-849E-531C-C594-30F1F86A4EA5"
// Read/Write/Indicate

// Write/Indicate
case authentication = "F8083535-849E-531C-C594-30F1F86A4EA5"

// Read/Write/Notify
case backfill = "F8083536-849E-531C-C594-30F1F86A4EA5"

// // Unknown attribute present on older G6 transmitters
// case unknown1 = "F8083537-849E-531C-C594-30F1F86A4EA5"
//
// // Updated G6 characteristic (read/notify)
// case unknown2 = "F8083538-849E-531C-C594-30F1F86A4EA5"
}


Expand Down
2 changes: 1 addition & 1 deletion CGMBLEKit/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
8 changes: 4 additions & 4 deletions CGMBLEKit/Messages/AuthChallengeRxMessage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Foundation


struct AuthChallengeRxMessage: TransmitterRxMessage {
let authenticated: UInt8
let bonded: UInt8
let isAuthenticated: Bool
let isBonded: Bool

init?(data: Data) {
guard data.count >= 3 else {
Expand All @@ -22,7 +22,7 @@ struct AuthChallengeRxMessage: TransmitterRxMessage {
return nil
}

authenticated = data[1]
bonded = data[2]
isAuthenticated = data[1] == 0x1
isBonded = data[2] == 0x1
}
}
47 changes: 38 additions & 9 deletions CGMBLEKit/Transmitter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ public final class Transmitter: BluetoothManagerDelegate {

peripheralManager.perform { (peripheral) in
if self.passiveModeEnabled {
self.log.debug("Listening for control commands in passive mode")
self.log.debug("Listening for authentication responses in passive mode")
do {
try peripheral.listenToControl()
try peripheral.listenToCharacteristic(.authentication)
} catch let error {
self.delegateQueue.async {
self.delegate?.transmitter(self, didError: error)
Expand All @@ -162,14 +162,14 @@ public final class Transmitter: BluetoothManagerDelegate {
self.log.debug("Authenticating with transmitter")
let status = try peripheral.authenticate(id: self.id)

if status.bonded != 0x1 {
if !status.isBonded {
self.log.debug("Requesting bond")
try peripheral.requestBond()

self.log.debug("Bonding request sent. Waiting user to respond.")
}

try peripheral.enableNotify(shouldWaitForBond: status.bonded != 0x1)
try peripheral.enableNotify(shouldWaitForBond: !status.isBonded)
defer {
self.log.debug("Initiating a disconnect")
peripheral.disconnect()
Expand Down Expand Up @@ -319,6 +319,28 @@ public final class Transmitter: BluetoothManagerDelegate {

self.backfillBuffer?.append(response)
}

func bluetoothManager(_ manager: BluetoothManager, peripheralManager: PeripheralManager, didReceiveAuthenticationResponse response: Data) {

if let message = AuthChallengeRxMessage(data: response), message.isBonded, message.isAuthenticated {
self.log.debug("Observed authenticated session. enabling notifications for control characteristic.")
peripheralManager.perform { (peripheral) in
do {
try peripheral.listenToCharacteristic(.control)
try peripheral.listenToCharacteristic(.backfill)
} catch let error {
self.log.error("Error trying to enable notifications on control characteristic: %{public}@", String(describing: error))
}
do {
try peripheral.stopListeningToCharacteristic(.authentication)
} catch let error {
self.log.error("Error trying to disable notifications on authentication characteristic: %{public}@", String(describing: error))
}
}
} else {
self.log.debug("Ignoring authentication response: %{public}@", response.hexadecimalString)
}
}
}


Expand Down Expand Up @@ -390,7 +412,7 @@ fileprivate extension PeripheralManager {
throw TransmitterError.authenticationError("Unable to parse auth status: \(error)")
}

guard challengeResponse.authenticated == 1 else {
guard challengeResponse.isAuthenticated else {
throw TransmitterError.authenticationError("Transmitter rejected auth challenge")
}

Expand Down Expand Up @@ -478,12 +500,19 @@ fileprivate extension PeripheralManager {
}
}

fileprivate func listenToControl() throws {
func listenToCharacteristic(_ characteristic: CGMServiceCharacteristicUUID) throws {
do {
try setNotifyValue(true, for: .control)
try setNotifyValue(true, for: .backfill)
try setNotifyValue(true, for: characteristic)
} catch let error {
throw TransmitterError.controlError("Error enabling notification: \(error)")
throw TransmitterError.controlError("Error enabling notification for \(characteristic): \(error)")
}
}

func stopListeningToCharacteristic(_ characteristic: CGMServiceCharacteristicUUID) throws {
do {
try setNotifyValue(false, for: characteristic)
} catch let error {
throw TransmitterError.controlError("Error disabling notification for \(characteristic): \(error)")
}
}
}
2 changes: 1 addition & 1 deletion CGMBLEKitTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion CGMBLEKitUI/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "LoopKit/LoopKit" "v2.2.1"
github "LoopKit/LoopKit" "v2.2.2"
github "LoopKit/dexcom-share-client-swift" "v1.0"
2 changes: 1 addition & 1 deletion ResetTransmitter/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0</string>
<string>3.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
Expand Down