Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Cartfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" == 1.2.1
github "LoopKit/LoopKit" == 1.2.2
github "LoopKit/xDripG5" ~> 0.8.0
github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
github "mddub/dexcom-share-client-swift" == 0.2.1
github "mddub/G4ShareSpy" == 0.3.2
github "ps2/rileylink_ios" ~> 1.0
github "ps2/rileylink_ios" == 1.0.1
github "amplitude/Amplitude-iOS" ~> 3.8.5
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" "v1.2.1"
github "LoopKit/LoopKit" "v1.2.2"
github "LoopKit/xDripG5" "v0.8.0"
github "amplitude/Amplitude-iOS" "v3.14.1"
github "bharat/SwiftCharts" "9faad7c38762a177ae01382def605a77c0e61aba"
github "mddub/G4ShareSpy" "v0.3.2"
github "mddub/dexcom-share-client-swift" "v0.2.1"
github "ps2/rileylink_ios" "v1.0"
github "ps2/rileylink_ios" "v1.0.1"
10 changes: 8 additions & 2 deletions Carthage/Build/.Amplitude-iOS.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Carthage/Build/.G4ShareSpy.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Carthage/Build/.LoopKit.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions Carthage/Build/.SwiftCharts.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Carthage/Build/.dexcom-share-client-swift.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions Carthage/Build/.rileylink_ios.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions Carthage/Build/.xDripG5.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/Amplitude.framework/Amplitude
Binary file not shown.
Binary file modified Carthage/Build/iOS/Amplitude.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/CarbKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Crypto
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/InsulinKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/InsulinKit
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Assets.car
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/LoopKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/LoopKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/MinimedKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/MinimedKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/ShareClient.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/ShareClient.framework/ShareClient
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/SwiftCharts.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/xDripG5.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/xDripG5.framework/xDripG5
Binary file not shown.
9 changes: 4 additions & 5 deletions Loop/Managers/DeviceDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,8 @@ final class DeviceDataManager {
}

remoteDataManager.nightscoutService.uploader?.reset()
loopManager.doseStore.pumpID = pumpID

loopManager.doseStore.resetPumpData()

UserDefaults.standard.pumpID = pumpID
}
Expand Down Expand Up @@ -613,8 +614,7 @@ final class DeviceDataManager {
statusExtensionManager = StatusExtensionDataManager(deviceDataManager: self)
loopManager = LoopDataManager(
delegate: self,
lastLoopCompleted: statusExtensionManager.context?.loop?.lastCompleted,
pumpID: pumpID
lastLoopCompleted: statusExtensionManager.context?.loop?.lastCompleted
)
watchManager = WatchDataManager(deviceDataManager: self)
nightscoutDataManager = NightscoutDataManager(deviceDataManager: self)
Expand Down Expand Up @@ -655,8 +655,7 @@ extension DeviceDataManager: CGMManagerDelegate {
extension DeviceDataManager: DoseStoreDelegate {
func doseStore(_ doseStore: DoseStore,
hasEventsNeedingUpload pumpEvents: [PersistedPumpEvent],
fromPumpID pumpID: String,
withCompletion completionHandler: @escaping (_ uploadedObjects: [NSManagedObjectID]) -> Void
completion completionHandler: @escaping (_ uploadedObjects: [NSManagedObjectID]) -> Void
) {
guard let uploader = remoteDataManager.nightscoutService.uploader, let pumpModel = pumpState?.pumpModel else {
completionHandler(pumpEvents.map({ $0.objectID }))
Expand Down
2 changes: 0 additions & 2 deletions Loop/Managers/LoopDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ final class LoopDataManager {
init(
delegate: LoopDataManagerDelegate,
lastLoopCompleted: Date?,
pumpID: String?,
basalRateSchedule: BasalRateSchedule? = UserDefaults.standard.basalRateSchedule,
carbRatioSchedule: CarbRatioSchedule? = UserDefaults.standard.carbRatioSchedule,
insulinActionDuration: TimeInterval? = UserDefaults.standard.insulinActionDuration,
Expand All @@ -64,7 +63,6 @@ final class LoopDataManager {
)

doseStore = DoseStore(
pumpID: pumpID,
insulinActionDuration: insulinActionDuration,
basalProfile: basalRateSchedule,
insulinSensitivitySchedule: insulinSensitivitySchedule
Expand Down