Skip to content

Temp basal delivery #1

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 24 commits into from
Aug 16, 2019
Merged

Temp basal delivery #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9ccae10
Workspace testing for temp-basal-delivery branches
ps2 Aug 5, 2019
2390d19
Bump submodule revs
ps2 Aug 6, 2019
b319523
Bump submodule revisions
ps2 Aug 6, 2019
d023efa
Bump submodule revs
ps2 Aug 6, 2019
0871df7
Bump submodule revs
ps2 Aug 7, 2019
cb8882f
Add image showing how to select scheme in xcode
ps2 Aug 8, 2019
94e9771
Update README.md
ps2 Aug 8, 2019
38b1957
Update submodule revisions
ps2 Aug 11, 2019
f9fa9a9
Merge branch 'temp-basal-delivery' of github.com:LoopKit/LoopWorkspac…
ps2 Aug 11, 2019
022bcb9
Update submodule revs
ps2 Aug 11, 2019
a79aadc
Bump submodule revisions
ps2 Aug 11, 2019
5b47a49
Update submodule revisions
ps2 Aug 11, 2019
b61cb26
Update submodule refs
ps2 Aug 11, 2019
270bb2a
Update submodule refs
ps2 Aug 11, 2019
a5a7f5c
Bump submodule revs
ps2 Aug 12, 2019
787c84c
Bump submodule revs
ps2 Aug 13, 2019
fc8b8d4
Bump submodule revs
ps2 Aug 13, 2019
6aebedb
Bump submodule revs
ps2 Aug 13, 2019
de3a7b0
bump submodule revs
ps2 Aug 13, 2019
3996527
bump submodule revs
ps2 Aug 13, 2019
b0e73dd
bump submodule revs
ps2 Aug 15, 2019
86f2bab
Bump submodule revs?
ps2 Aug 15, 2019
124df45
update to dev
ps2 Aug 16, 2019
53fbc17
Merge branch 'dev' into temp-basal-delivery
ps2 Aug 16, 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 Loop
Open in desktop
Submodule Loop updated 16 files
+2 −2 Cartfile.resolved
+7 −7 Common/Models/StatusExtensionContext.swift
+12 −8 Loop.xcodeproj/project.pbxproj
+50 −0 Loop/Extensions/BasalDeliveryState.swift
+2 −2 Loop/Extensions/PersistedPumpEvent.swift
+24 −10 Loop/Managers/DeviceDataManager.swift
+86 −51 Loop/Managers/LoopDataManager.swift
+11 −5 Loop/Managers/NightscoutDataManager.swift
+8 −10 Loop/Managers/StatusExtensionDataManager.swift
+6 −6 Loop/Managers/WatchDataManager.swift
+25 −3 Loop/Models/NetBasal.swift
+13 −13 Loop/Models/StatusExtensionContext+LoopKit.swift
+2 −0 Loop/View Controllers/BolusViewController+LoopDataManager.swift
+31 −11 Loop/View Controllers/StatusTableViewController.swift
+2 −2 LoopUI/Charts/DoseChart.swift
+0 −28 prep_workspace.sh
2 changes: 1 addition & 1 deletion LoopKit
Open in desktop
Submodule LoopKit updated 26 files
+10 −2 LoopKit.xcodeproj/project.pbxproj
+2 −0 LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme
+4 −32 LoopKit.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+42 −2 LoopKit/InsulinKit/CachedInsulinDeliveryObject+CoreDataClass.swift
+1 −0 LoopKit/InsulinKit/CachedInsulinDeliveryObject+CoreDataProperties.swift
+17 −14 LoopKit/InsulinKit/DoseEntry.swift
+108 −83 LoopKit/InsulinKit/DoseStore.swift
+29 −3 LoopKit/InsulinKit/HKQuantitySample+InsulinKit.swift
+48 −28 LoopKit/InsulinKit/InsulinMath.swift
+4 −1 LoopKit/InsulinKit/PersistedPumpEvent.swift
+19 −0 LoopKit/InsulinKit/PumpEvent+CoreDataClass.swift
+2 −0 LoopKit/InsulinKit/PumpEvent+CoreDataProperties.swift
+9 −3 LoopKit/Persistence/Model.xcdatamodeld/Model.xcdatamodel/contents
+4 −1 LoopKit/PumpManager.swift
+13 −3 LoopKit/PumpManagerStatus.swift
+4 −2 LoopKit/TemporaryScheduleOverrideHistory.swift
+10 −10 LoopKitTests/DoseStoreTests.swift
+117 −37 LoopKitTests/InsulinMathTests.swift
+17 −0 LoopKitTests/TemporaryScheduleOverrideHistoryTests.swift
+31 −0 LoopKitTests/TemporaryScheduleOverrideTests.swift
+8 −4 LoopKitUI/Views/SuspendResumeTableViewCell.swift
+2 −2 MockKit/MockDoseProgressEstimator.swift
+166 −186 MockKit/MockPumpManager.swift
+191 −0 MockKit/MockPumpManagerState.swift
+229 −0 MockKit/UnfinalizedDose.swift
+1 −1 MockKitUI/View Controllers/MockPumpManagerSettingsViewController.swift
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ xed .
## Build

Select the "Loop (Workspace)" scheme (not the "Loop" scheme) and Build, Run, or Test.

<a href="/docs/scheme-selection.png"><img src="/docs/scheme-selection.png?raw=true" alt="Image showing how to select the Loop (Workspace) scheme in Xcode" width="400"></a>

Binary file added docs/scheme-selection.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion rileylink_ios
Open in desktop
Submodule rileylink_ios updated 47 files
+1 −1 .travis.yml
+1 −1 Cartfile.resolved
+1 −1 Crypto/Info.plist
+1 −1 MinimedKit/Info.plist
+0 −4 MinimedKit/Messages/Models/TimestampedGlucoseEvent.swift
+8 −11 MinimedKit/Messages/Models/TimestampedHistoryEvent.swift
+13 −2 MinimedKit/Models/PumpModel.swift
+9 −3 MinimedKit/PumpManager/DoseStore.swift
+6 −6 MinimedKit/PumpManager/MinimedDoseProgressEstimator.swift
+223 −48 MinimedKit/PumpManager/MinimedPumpManager.swift
+7 −0 MinimedKit/PumpManager/MinimedPumpManagerError.swift
+14 −4 MinimedKit/PumpManager/MinimedPumpManagerRecents.swift
+134 −8 MinimedKit/PumpManager/MinimedPumpManagerState.swift
+227 −0 MinimedKit/PumpManager/UnfinalizedDose.swift
+1 −1 MinimedKitTests/Info.plist
+24 −6 MinimedKitTests/TimestampedHistoryEventTests.swift
+1 −1 MinimedKitUI/Info.plist
+2 −1 MinimedKitUI/Setup/MinimedPumpIDSetupViewController.swift
+1 −1 NightscoutUploadKit/Info.plist
+1 −1 NightscoutUploadKitTests/Info.plist
+1 −1 OmniKit/Info.plist
+7 −7 OmniKit/MessageTransport/MessageBlocks/TempBasalExtraCommand.swift
+3 −1 OmniKit/MessageTransport/MessageTransport.swift
+55 −14 OmniKit/Model/UnfinalizedDose.swift
+118 −77 OmniKit/PumpManager/OmnipodPumpManager.swift
+10 −11 OmniKit/PumpManager/OmnipodPumpManagerState.swift
+1 −1 OmniKit/PumpManager/PodComms.swift
+19 −13 OmniKit/PumpManager/PodCommsSession.swift
+1 −1 OmniKit/PumpManager/PodDoseProgressEstimator.swift
+80 −37 OmniKit/PumpManager/PodState.swift
+1 −1 OmniKitTests/Info.plist
+0 −2 OmniKitTests/PodCommsSessionTests.swift
+5 −5 OmniKitTests/TempBasalTests.swift
+1 −1 OmniKitUI/Info.plist
+2 −2 OmniKitUI/ViewControllers/OmnipodSettingsViewController.swift
+53 −306 RileyLink.xcodeproj/project.pbxproj
+144 −0 RileyLink.xcodeproj/xcshareddata/xcschemes/RileyLink.xcscheme
+0 −74 RileyLink.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme
+1 −1 RileyLink/DeviceDataManager.swift
+1 −1 RileyLink/RileyLink-Info.plist
+1 −1 RileyLinkBLEKit/Info.plist
+1 −1 RileyLinkBLEKitTests/Info.plist
+1 −1 RileyLinkKit/Info.plist
+1 −1 RileyLinkKitTests/Info.plist
+1 −1 RileyLinkKitUI/Info.plist
+2 −2 RileyLinkKitUI/RileyLinkDevicesTableViewDataSource.swift
+1 −1 RileyLinkTests/RileyLinkTests-Info.plist