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.

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

Omnipod Integration #923

Open
wants to merge 98 commits into
base: dev
from
Open
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
36a2a53
Omnikit
ps2 Sep 2, 2018
5746df1
Add OmniKit frameworks
ps2 Sep 11, 2018
6988bb8
fix cartfile
ps2 Sep 12, 2018
1b23177
Track lastAddedPumpData, including lastAddedPumpEvents
ps2 Sep 15, 2018
6b4544c
Fix carthage copy frameworks script
ps2 Sep 19, 2018
5e9f41a
rebase
ps2 Sep 20, 2018
096b347
update deps
ps2 Sep 25, 2018
65e3c9e
Initialize setupViewController with existing pump settings
ps2 Sep 26, 2018
2ee5feb
Suspend/Resume
ps2 Sep 28, 2018
ad73ea8
Use normal separator behavior
ps2 Sep 28, 2018
230a441
Reload pump section after adding pumpmanager
ps2 Sep 29, 2018
83f2943
LoopKit PumpManagerStatus updates
ps2 Oct 11, 2018
ff978b4
Merge in dev
ps2 Oct 11, 2018
d0c4a91
PumpManagerUI vended HUD views
ps2 Oct 18, 2018
b2a68e0
Add missing file
ps2 Oct 22, 2018
63932d1
Update to LoopKit naming changes
ps2 Oct 22, 2018
8524093
Push instead of present pumpmanager vended vc in response to HUD view…
ps2 Oct 23, 2018
37ef4aa
Add prep_workspace.sh script
ps2 Oct 23, 2018
996bc3d
HUDProvider updates
ps2 Oct 26, 2018
c32cd8c
Fix hud clearing after removing pump manager. Show boluses that take …
ps2 Oct 31, 2018
76c8f26
PumpManager returns DoseEntry for requested bolus, including duration
ps2 Nov 4, 2018
bdaea1d
Example jumpstart
ps2 Nov 6, 2018
b535cfc
Suspend/Resume with new PumpManager status updates
ps2 Nov 20, 2018
3a12b02
Fix issue with DeviceDataManager missing from issue report
ps2 Nov 26, 2018
b4276a1
Handle LoopKit and rileylink_ios updates
ps2 Dec 2, 2018
511f0c2
Cleanup testing code
ps2 Dec 5, 2018
fb006e5
Update Loop today widget when HUD views change
ps2 Dec 9, 2018
3624d1a
Renaming updates from LoopKit
ps2 Jan 11, 2019
8598af6
Updates for recent LoopKit pumpmanager-changes branch
ps2 Jan 22, 2019
6a9ce73
update prep script for CGMBLEKit branch change
Kdisimone Jan 22, 2019
0334c23
Merge pull request #12 from ps2/Kdisimone-patch-1
ps2 Jan 22, 2019
849916d
Updates for hud provider delegate change
ps2 Jan 29, 2019
a7f89ca
Merge branch 'omnikit' of github.com:ps2/loop-priv into omnikit
ps2 Jan 29, 2019
8a152ee
Pumpmanager updates
ps2 Jan 30, 2019
dd2e2c3
Update prep script
ps2 Jan 30, 2019
a18cfb4
Fix permissions on prep workspace script
ps2 Jan 30, 2019
2683aa5
Merge in dev
ps2 Jan 31, 2019
e22f4b0
Pumpmanager changes
ps2 Feb 2, 2019
c0c2242
Update to pumpmanager-updates
ps2 Feb 3, 2019
7cff7b4
Back out DEVELOPMENT_TEAM settings
ps2 Feb 5, 2019
ebd1e2b
Context object does not need HUDProvider reference
ps2 Feb 5, 2019
ba571a7
Include dose in enactBolus completion
ps2 Feb 5, 2019
f209407
Add omnikit back to Loop
ps2 Feb 6, 2019
e54617a
Bump dependency revisions
ps2 Feb 6, 2019
6a24216
Update HUD set of views only on PumpManager change
ps2 Feb 7, 2019
9a6f219
Merge branch 'pumpmanager-changes' of github.com:LoopKit/Loop into pu…
ps2 Feb 7, 2019
8a893b6
Remove unused file
ps2 Feb 7, 2019
5147bfd
Merge branch 'pumpmanager-changes' of github.com:LoopKit/Loop into om…
ps2 Feb 7, 2019
23842de
synchronize deviceDataManager.pumpManagerStatus access
ps2 Feb 8, 2019
9a729c6
Bump dep revisions
ps2 Feb 8, 2019
509573c
Remove unused files
ps2 Feb 8, 2019
26e0ea5
Remove unneeded reloadSections calls
ps2 Feb 8, 2019
3e8f83c
Merge branch 'pumpmanager-changes' of github.com:LoopKit/Loop into pu…
ps2 Feb 8, 2019
d020d86
Merge branch 'pumpmanager-changes' of github.com:LoopKit/Loop into om…
ps2 Feb 8, 2019
2493df5
Add script for workspace prep
ps2 Feb 8, 2019
538e337
Bump rileylink_ios rev
ps2 Feb 8, 2019
ac68688
Link in OmniKit frameworks
ps2 Feb 8, 2019
14ae518
Fix build issue when carthage is run from Xcode
ps2 Feb 8, 2019
bbd36d1
Only allow BLE to trigger looping every 5 minutes
ps2 Feb 9, 2019
995c3e2
Use bolus end date to clear lastRequestedBolus
ps2 Feb 11, 2019
83b1e2e
present instead of show settings vc
ps2 Feb 11, 2019
82e66f0
small refactorings
ps2 Feb 11, 2019
4f652a8
Improvements from @mpangburn's review
ps2 Feb 13, 2019
2985424
Update active flag on HUDProvider when hud is visible and app is active
ps2 Feb 15, 2019
be5f843
Remove signing team changes
ps2 Feb 15, 2019
a14d597
Merge remote-tracking branch 'origin/pumpmanager-changes' into omnikit
ps2 Feb 15, 2019
9e27c6b
HUDProvider active -> visible
ps2 Feb 16, 2019
e12cb26
Merge remote-tracking branch 'origin/pumpmanager-changes' into omnikit
ps2 Feb 16, 2019
9cdefeb
Update to dev LoopKit
ps2 Feb 19, 2019
9d9e6e2
Update to dev LoopKit
ps2 Feb 19, 2019
8d48ada
Merge in basal-picker
ps2 Mar 5, 2019
2478961
Limit recommended temp basals to supported rates.
ps2 Mar 6, 2019
d204ca2
Merge branch 'supported-temp-basal-rates' of github.com:tidepool-org/…
ps2 Mar 6, 2019
3212f6e
Merge remote-tracking branch 'origin/supported-temp-basal-rates' into…
ps2 Mar 6, 2019
1afb294
Merge remote-tracking branch 'origin/dev' into omnikit
ps2 Mar 9, 2019
c36cc77
Unset DEVELOPMENT_TEAM
ps2 Mar 9, 2019
d350e23
Merge remote-tracking branch 'origin/dev' into omnikit
ps2 Mar 9, 2019
ef67244
Remove lockedSupportedTempBasalRates
ps2 Mar 9, 2019
00fd4b6
Update to new GlucoseRangeSchedule.Override initializer signature
ps2 Mar 9, 2019
a2109d1
Merge remote-tracking branch 'origin/dev' into omnikit
ps2 Mar 20, 2019
f18417f
Copy LoopTestingKit framework to Loop app bundle
ps2 Mar 20, 2019
a7b01e1
Merge remote-tracking branch 'origin/dev' into omnikit
ps2 Mar 20, 2019
40b599a
Merge remote-tracking branch 'origin/dev' into omnikit
ps2 Mar 29, 2019
8c6b9c6
update swift charts for Xcode 10.2
Kdisimone Apr 1, 2019
a7d90cd
Updated cartfile.resolved for swift charts 0.6.5
Kdisimone Apr 1, 2019
3716343
Merge pull request #15 from ps2/Kdisimone-patch-2
ps2 Apr 1, 2019
4f84a81
Merge branch 'dev' into omnikit
ps2 Apr 6, 2019
574fc80
Handle notifications scheduled by DeviceManagers
ps2 Apr 12, 2019
76676d9
Merge remote-tracking branch 'origin/devicemanager-notifications' int…
ps2 Apr 12, 2019
9956125
Checkout notification-identifiers branch of LoopKit
ps2 Apr 12, 2019
00c78e0
Perform UNUserNotificationCenter calls on main queue
ps2 Apr 12, 2019
bcb0eaa
Use omnipod-testing branches
ps2 Apr 21, 2019
d90252a
Bump rileylink_ios/omnipod-testing rev
ps2 Apr 22, 2019
77a1cfa
include pump manufacturer and model in the pump status
jasoncalabrese May 4, 2019
3cec2f3
only upload the reservoir units if they're current
jasoncalabrese May 5, 2019
561aa12
Merge pull request #947 from jasoncalabrese/omnipod-testing-pump-status
ps2 May 9, 2019
b7eca0d
Bump rileylink_ios rev
ps2 May 9, 2019
a12dd42
Fix initial checkout branch for workspace builds
ps2 May 12, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Fix hud clearing after removing pump manager. Show boluses that take …

…> 5 minutes
  • Loading branch information...
ps2 committed Oct 31, 2018
commit c32cd8cc7e762f6c02705593f184ef50114bb9cd
@@ -21,6 +21,12 @@ final class DeviceDataManager {
if cgmManager is PumpManagerUI {
cgmManager = nil
}

if let pumpManager = pumpManager {
pumpManagerHUDProvider = pumpManager.hudProvider()
} else {
pumpManagerHUDProvider = nil
}

setupPump()

@@ -83,7 +83,7 @@ extension StatusChartsManager {
for entry in doseEntries {
let time = entry.endDate.timeIntervalSince(entry.startDate)

if entry.type == .bolus && entry.netBasalUnits > 0 && time < .minutes(5) {
if entry.type == .bolus && entry.units > 0 {
let x = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
let y = ChartAxisValueDoubleLog(actualDouble: entry.units, unitString: "U", formatter: doseFormatter)

@@ -1065,15 +1065,16 @@ final class StatusTableViewController: ChartsTableViewController {
}

private func configurePumpManagerHUDViews() {
if var pumpManagerHUDProvider = deviceManager.pumpManagerHUDProvider,
let hudView = hudView
{
let views = pumpManagerHUDProvider.createHUDViews()
if let hudView = hudView {
hudView.removeNonStandardHUDViews()
for view in views {
addViewToHUD(view)
if var pumpManagerHUDProvider = deviceManager.pumpManagerHUDProvider
{
let views = pumpManagerHUDProvider.createHUDViews()
for view in views {
addViewToHUD(view)
}
pumpManagerHUDProvider.delegate = self
}
pumpManagerHUDProvider.delegate = self
}
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.