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

DRAFT: Basic ble & connect flow #8

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

DRAFT: Basic ble & connect flow #8

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db653de
wip: start BLE flow
Feb 25, 2025
cac0439
fix: init peripheralManager
Feb 25, 2025
41f494b
wip: start authPackage
Feb 26, 2025
d647987
wip: completed auth/connect flow
Feb 27, 2025
1c2c4f5
wip: process feedback plus start unit test
Mar 2, 2025
f1430a3
wip: continue unit tests
Mar 6, 2025
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
22 changes: 22 additions & 0 deletions Common/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// Data.swift
// MedtrumKit
//
// Created by Bastiaan Verhaar on 26/02/2025.
//

extension Data {
func toUInt64() -> UInt64 {
guard self.count <= 8 else {
preconditionFailure("Cannot convert Data to UInt64, size too long")
}

var result: UInt64 = 0
for i in 0..<self.count {
let shifted = UInt64(self[i]) << (8 * i)
result |= shifted
}

return result
}
}
19 changes: 19 additions & 0 deletions Common/Date.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// Date.swift
// MedtrumKit
//
// Created by Bastiaan Verhaar on 27/02/2025.
//

let baseUnix: TimeInterval = .seconds(1388530800) //2014-01-01T00:00:00+0000

extension Date {
static func fromMedtrumSeconds(_ seconds: UInt64) -> Date {
return Date(timeIntervalSince1970: baseUnix + Double(seconds))
}

static func toMedtrumSeconds() -> Data {
let data = UInt64(Date.now.timeIntervalSince1970 - baseUnix)
return data.toData(length: 4)
}
}
17 changes: 17 additions & 0 deletions Common/UInt64.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// UInt64.swift
// MedtrumKit
//
// Created by Bastiaan Verhaar on 26/02/2025.
//

extension UInt64 {
func toData(length: Int) -> Data {
var output = Data(count: length)
for i in 0...length {
output[i] = UInt8(self << (i * 8) & 0xFF)
}

return output
}
}
114 changes: 113 additions & 1 deletion MedtrumKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@
objects = {

/* Begin PBXBuildFile section */
3E1390102D6E534C00A146C1 /* BluetoothManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E13900F2D6E534600A146C1 /* BluetoothManager.swift */; };
3E1390122D6E59B500A146C1 /* MedtrumPumpState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1390112D6E59B000A146C1 /* MedtrumPumpState.swift */; };
3E1390152D6E5C5E00A146C1 /* MedtrumScanResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1390142D6E5C5200A146C1 /* MedtrumScanResult.swift */; };
3E1390172D6E5EA000A146C1 /* MedtrumConnectResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1390162D6E5E9A00A146C1 /* MedtrumConnectResult.swift */; };
3E1390192D6E5F3600A146C1 /* PeripheralManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1390182D6E5F2B00A146C1 /* PeripheralManager.swift */; };
3E1532422D6F93EF0020F015 /* BasePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1532412D6F93E70020F015 /* BasePacket.swift */; };
3E1532442D6F94E30020F015 /* AuthorizePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1532432D6F94E20020F015 /* AuthorizePacket.swift */; };
3E1532462D6F95AC0020F015 /* CommandType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1532452D6F95A70020F015 /* CommandType.swift */; };
3E1532482D6F98D20020F015 /* Crypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1532472D6F98CF0020F015 /* Crypto.swift */; };
3E15324A2D6FA0080020F015 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1532492D6FA0060020F015 /* Data.swift */; };
3E15324C2D6FA4280020F015 /* UInt64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E15324B2D6FA4250020F015 /* UInt64.swift */; };
3E15324E2D6FA7EE0020F015 /* WritePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E15324D2D6FA7E70020F015 /* WritePacket.swift */; };
3E5060142D70E5CB00376609 /* Crc8.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060132D70E5C900376609 /* Crc8.swift */; };
3E5060162D70E62E00376609 /* ReadPacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060152D70E62B00376609 /* ReadPacket.swift */; };
3E5060182D70EAF800376609 /* MedtrumWriteResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060172D70EAF400376609 /* MedtrumWriteResult.swift */; };
3E50601A2D70F2F500376609 /* GetDeviceTypePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060192D70F2F300376609 /* GetDeviceTypePacket.swift */; };
3E50601C2D70F69900376609 /* GetTimePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E50601B2D70F69800376609 /* GetTimePacket.swift */; };
3E50601E2D70F7A900376609 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E50601D2D70F7A700376609 /* Date.swift */; };
3E5060202D70F97500376609 /* SetTimePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E50601F2D70F97500376609 /* SetTimePacket.swift */; };
3E5060222D70FDA100376609 /* SetTimeZonePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060212D70FDA000376609 /* SetTimeZonePacket.swift */; };
3E5060242D70FED500376609 /* SynchronizePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060232D70FED500376609 /* SynchronizePacket.swift */; };
3E5060262D71035900376609 /* SubscribePacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E5060252D71035900376609 /* SubscribePacket.swift */; };
3E767D022D67B315004B1971 /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E767CFD2D67B192004B1971 /* LocalizedString.swift */; };
3E767D032D67B319004B1971 /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E767CE42D67AF35004B1971 /* OSLog.swift */; };
3E767D042D67B3FC004B1971 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3E767CFB2D67B13C004B1971 /* Localizable.strings */; };
Expand Down Expand Up @@ -60,6 +82,28 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3E13900F2D6E534600A146C1 /* BluetoothManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothManager.swift; sourceTree = "<group>"; };
3E1390112D6E59B000A146C1 /* MedtrumPumpState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedtrumPumpState.swift; sourceTree = "<group>"; };
3E1390142D6E5C5200A146C1 /* MedtrumScanResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedtrumScanResult.swift; sourceTree = "<group>"; };
3E1390162D6E5E9A00A146C1 /* MedtrumConnectResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedtrumConnectResult.swift; sourceTree = "<group>"; };
3E1390182D6E5F2B00A146C1 /* PeripheralManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeripheralManager.swift; sourceTree = "<group>"; };
3E1532412D6F93E70020F015 /* BasePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasePacket.swift; sourceTree = "<group>"; };
3E1532432D6F94E20020F015 /* AuthorizePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorizePacket.swift; sourceTree = "<group>"; };
3E1532452D6F95A70020F015 /* CommandType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandType.swift; sourceTree = "<group>"; };
3E1532472D6F98CF0020F015 /* Crypto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = "<group>"; };
3E1532492D6FA0060020F015 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
3E15324B2D6FA4250020F015 /* UInt64.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UInt64.swift; sourceTree = "<group>"; };
3E15324D2D6FA7E70020F015 /* WritePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WritePacket.swift; sourceTree = "<group>"; };
3E5060132D70E5C900376609 /* Crc8.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Crc8.swift; sourceTree = "<group>"; };
3E5060152D70E62B00376609 /* ReadPacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadPacket.swift; sourceTree = "<group>"; };
3E5060172D70EAF400376609 /* MedtrumWriteResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedtrumWriteResult.swift; sourceTree = "<group>"; };
3E5060192D70F2F300376609 /* GetDeviceTypePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetDeviceTypePacket.swift; sourceTree = "<group>"; };
3E50601B2D70F69800376609 /* GetTimePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetTimePacket.swift; sourceTree = "<group>"; };
3E50601D2D70F7A700376609 /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = "<group>"; };
3E50601F2D70F97500376609 /* SetTimePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetTimePacket.swift; sourceTree = "<group>"; };
3E5060212D70FDA000376609 /* SetTimeZonePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetTimeZonePacket.swift; sourceTree = "<group>"; };
3E5060232D70FED500376609 /* SynchronizePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SynchronizePacket.swift; sourceTree = "<group>"; };
3E5060252D71035900376609 /* SubscribePacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscribePacket.swift; sourceTree = "<group>"; };
3E767CE22D67ADFA004B1971 /* MedtrumKitPumpManager+UI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MedtrumKitPumpManager+UI.swift"; sourceTree = "<group>"; };
3E767CE42D67AF35004B1971 /* OSLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = "<group>"; };
3E767CE52D67B13C004B1971 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ../Localization/ar.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand All @@ -86,7 +130,7 @@
3E767CFA2D67B13C004B1971 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "../Localization/zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
3E767CFD2D67B192004B1971 /* LocalizedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedString.swift; sourceTree = "<group>"; };
3E767CFE2D67B1A9004B1971 /* MedtrumHUDProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MedtrumHUDProvider.swift; sourceTree = "<group>"; };
3E767D052D67B4A0004B1971 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
3E767D052D67B4A0004B1971 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3E767D072D67B63B004B1971 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
3E767D432D67B790004B1971 /* MedtrumKitPlugin.loopplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MedtrumKitPlugin.loopplugin; sourceTree = BUILT_PRODUCTS_DIR; };
3E767D4C2D67BA71004B1971 /* LoopKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKitUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -132,6 +176,43 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3E1390132D6E5C4900A146C1 /* Models */ = {
isa = PBXGroup;
children = (
3E5060172D70EAF400376609 /* MedtrumWriteResult.swift */,
3E1390162D6E5E9A00A146C1 /* MedtrumConnectResult.swift */,
3E1390142D6E5C5200A146C1 /* MedtrumScanResult.swift */,
);
path = Models;
sourceTree = "<group>";
};
3E1532402D6F93DD0020F015 /* Packets */ = {
isa = PBXGroup;
children = (
3E5060252D71035900376609 /* SubscribePacket.swift */,
3E5060232D70FED500376609 /* SynchronizePacket.swift */,
3E5060212D70FDA000376609 /* SetTimeZonePacket.swift */,
3E50601F2D70F97500376609 /* SetTimePacket.swift */,
3E50601B2D70F69800376609 /* GetTimePacket.swift */,
3E5060192D70F2F300376609 /* GetDeviceTypePacket.swift */,
3E1532432D6F94E20020F015 /* AuthorizePacket.swift */,
3E1532452D6F95A70020F015 /* CommandType.swift */,
3E1532412D6F93E70020F015 /* BasePacket.swift */,
);
path = Packets;
sourceTree = "<group>";
};
3E5060122D70E5B000376609 /* Encryption */ = {
isa = PBXGroup;
children = (
3E5060152D70E62B00376609 /* ReadPacket.swift */,
3E15324D2D6FA7E70020F015 /* WritePacket.swift */,
3E5060132D70E5C900376609 /* Crc8.swift */,
3E1532472D6F98CF0020F015 /* Crypto.swift */,
);
path = Encryption;
sourceTree = "<group>";
};
3E767CE12D67AD91004B1971 /* MedtrumKitUI */ = {
isa = PBXGroup;
children = (
Expand All @@ -146,6 +227,9 @@
3E767CE32D67AF2B004B1971 /* Common */ = {
isa = PBXGroup;
children = (
3E50601D2D70F7A700376609 /* Date.swift */,
3E15324B2D6FA4250020F015 /* UInt64.swift */,
3E1532492D6FA0060020F015 /* Data.swift */,
3E98B8502D6BB2B900DD5123 /* TimeInterval.swift */,
3E767CFD2D67B192004B1971 /* LocalizedString.swift */,
3E767CE42D67AF35004B1971 /* OSLog.swift */,
Expand All @@ -164,6 +248,10 @@
B7189AE62C15A52800703DE2 /* PumpManager */ = {
isa = PBXGroup;
children = (
3E1390132D6E5C4900A146C1 /* Models */,
3E1390112D6E59B000A146C1 /* MedtrumPumpState.swift */,
3E13900F2D6E534600A146C1 /* BluetoothManager.swift */,
3E1390182D6E5F2B00A146C1 /* PeripheralManager.swift */,
B7189AE52C15A52800703DE2 /* MedtrumPumpManager.swift */,
);
path = PumpManager;
Expand Down Expand Up @@ -204,7 +292,9 @@
B7D3A8D22C148CC4002EE003 /* MedtrumKit */ = {
isa = PBXGroup;
children = (
3E5060122D70E5B000376609 /* Encryption */,
3E767D052D67B4A0004B1971 /* Info.plist */,
3E1532402D6F93DD0020F015 /* Packets */,
B7189AE62C15A52800703DE2 /* PumpManager */,
B7D3A8D32C148CC4002EE003 /* MedtrumKit.h */,
B7D3A8D42C148CC4002EE003 /* MedtrumKit.docc */,
Expand Down Expand Up @@ -420,14 +510,36 @@
buildActionMask = 2147483647;
files = (
3E767D562D67BCD6004B1971 /* MedtrumKitUICoordinator.swift in Sources */,
3E5060262D71035900376609 /* SubscribePacket.swift in Sources */,
3E5060202D70F97500376609 /* SetTimePacket.swift in Sources */,
3E1390172D6E5EA000A146C1 /* MedtrumConnectResult.swift in Sources */,
3E98B8512D6BB2BC00DD5123 /* TimeInterval.swift in Sources */,
3E5060142D70E5CB00376609 /* Crc8.swift in Sources */,
3E5060222D70FDA100376609 /* SetTimeZonePacket.swift in Sources */,
3E1532442D6F94E30020F015 /* AuthorizePacket.swift in Sources */,
3E767D022D67B315004B1971 /* LocalizedString.swift in Sources */,
3E767D522D67BC2E004B1971 /* MedtrumKitPumpManager+UI.swift in Sources */,
3E1390192D6E5F3600A146C1 /* PeripheralManager.swift in Sources */,
3E1532422D6F93EF0020F015 /* BasePacket.swift in Sources */,
3E50601C2D70F69900376609 /* GetTimePacket.swift in Sources */,
3E1390102D6E534C00A146C1 /* BluetoothManager.swift in Sources */,
3E15324C2D6FA4280020F015 /* UInt64.swift in Sources */,
3E1532462D6F95AC0020F015 /* CommandType.swift in Sources */,
3E767D032D67B319004B1971 /* OSLog.swift in Sources */,
3E1390122D6E59B500A146C1 /* MedtrumPumpState.swift in Sources */,
3E1532482D6F98D20020F015 /* Crypto.swift in Sources */,
B7D3A8F12C14F0EF002EE003 /* MedtrumKitPlugin.swift in Sources */,
B7189AE72C15A52800703DE2 /* MedtrumPumpManager.swift in Sources */,
3E5060162D70E62E00376609 /* ReadPacket.swift in Sources */,
3E767D532D67BC33004B1971 /* MedtrumHUDProvider.swift in Sources */,
3E15324E2D6FA7EE0020F015 /* WritePacket.swift in Sources */,
3E15324A2D6FA0080020F015 /* Data.swift in Sources */,
3E50601A2D70F2F500376609 /* GetDeviceTypePacket.swift in Sources */,
B7D3A8D52C148CC4002EE003 /* MedtrumKit.docc in Sources */,
3E5060242D70FED500376609 /* SynchronizePacket.swift in Sources */,
3E5060182D70EAF800376609 /* MedtrumWriteResult.swift in Sources */,
3E50601E2D70F7A900376609 /* Date.swift in Sources */,
3E1390152D6E5C5E00A146C1 /* MedtrumScanResult.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading