Skip to content

Commit abffbb8

Browse files
dthornleydthornley
committed
Squashed commit of the following:
commit a11b593 Author: Ivan Valkou <[email protected]> Date: Thu Dec 26 15:49:31 2019 +0300 Show last MB event in settings commit 8773d77 Author: Ivan Valkou <[email protected]> Date: Wed Dec 25 17:34:33 2019 +0300 Microbolus.Event commit 519609c Merge: 626630e 62952ae Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 19:30:11 2019 +0300 Merge branch 'dev-ivan' into microboluses # Conflicts: # Loop.xcconfig # Loop/Views/MicrobolusView.swift # LoopCore/Microbolus.swift commit 62952ae Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 19:28:15 2019 +0300 Set default partial application rate to 0.3 commit 310ffac Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 19:13:17 2019 +0300 add 'Not Limited' option to max sizes of MB commit 626630e Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 13:53:43 2019 +0300 The view is divided into small parts. commit 1ff5463 Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 13:53:43 2019 +0300 The view is divided into small parts. commit 3f688b1 Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 13:23:53 2019 +0300 MicrobolusView refactored commit 1a991ec Merge: 74ef344 a098d6a Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 13:26:18 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan commit db44386 Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 13:23:53 2019 +0300 MicrobolusView refactored commit 491458d Merge: 2abf5db a098d6a Author: Ivan Valkou <[email protected]> Date: Mon Dec 23 12:55:02 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses commit 2abf5db Author: Ivan Valkou <[email protected]> Date: Sun Dec 22 12:41:30 2019 +0300 Clear marketing version commit b7d2c43 Author: Ivan Valkou <[email protected]> Date: Sun Dec 22 12:35:13 2019 +0300 Clear signing commit 74ef344 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 17:02:26 2019 +0300 bump version commit 56bcbb5 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 16:59:50 2019 +0300 Partial bolus application UI setting commit 641f83f Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:55:03 2019 +0300 partialApplication parameter (default 0.5) commit a40bfa6 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 16:59:50 2019 +0300 Partial bolus application UI setting commit e79049b Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:55:03 2019 +0300 partialApplication parameter (default 0.5) commit f238db4 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:29:47 2019 +0300 Override `hasFinished` check commit 7a24458 Merge: 09a082d 650ffd4 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:42:12 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into dev-ivan # Conflicts: # Loop.xcconfig commit f13327a Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:39:39 2019 +0300 Revert CURRENT_PROJECT_VERSION commit 275923f Merge: 07d63e1 650ffd4 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:38:15 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses commit 07d63e1 Author: Ivan Valkou <[email protected]> Date: Sat Dec 21 15:29:47 2019 +0300 Override `hasFinished` check commit c9b97dd Author: Ivan Valkou <[email protected]> Date: Fri Dec 20 13:07:03 2019 +0300 Cleenup unused code commit 9888b57 Author: Ivan Valkou <[email protected]> Date: Fri Dec 20 12:59:18 2019 +0300 Remove Settings.bundle commit 03a7f86 Author: Ivan Valkou <[email protected]> Date: Fri Dec 20 12:57:49 2019 +0300 Remove NightscoutAPIClient commit 86bff4e Author: Ivan Valkou <[email protected]> Date: Fri Dec 20 12:50:15 2019 +0300 Revert "Current time line on charts (LoopKit#6)" This reverts commit 10f581e. commit 09a082d Author: Ivan Valkou <[email protected]> Date: Wed Dec 18 20:32:51 2019 +0300 Disabled pickers fixed commit d4841ed Author: Ivan Valkou <[email protected]> Date: Wed Dec 18 18:39:49 2019 +0300 bump version commit 8498438 Author: Ivan Valkou <[email protected]> Date: Wed Dec 18 18:31:33 2019 +0300 adaptiveRateNonlinear switch in settings commit d36f713 Author: Ivan Valkou <[email protected]> Date: Wed Dec 18 17:51:17 2019 +0300 Fix binding and update UI commit bbb0538 Author: Ivan Valkou <[email protected]> Date: Tue Dec 17 16:25:40 2019 +0300 busines logic and UI commit 31974cb Author: Ivan Valkou <[email protected]> Date: Sat Dec 14 18:33:32 2019 +0300 model and view commit 0d28665 Author: Ivan Valkou <[email protected]> Date: Sat Dec 7 15:04:51 2019 +0300 bump version commit 61308c8 Author: Ivan Valkou <[email protected]> Date: Sat Dec 7 14:00:55 2019 +0300 Remove UIApplication.protectedDataDidBecomeAvailableNotification commit 82243de Author: Ivan Valkou <[email protected]> Date: Sat Dec 7 13:55:49 2019 +0300 Cancel MB if already bolusing commit 7fa7357 Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 17:16:50 2019 +0300 Microbolus refactoring commit f464c52 Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 16:20:53 2019 +0300 NS Client updated commit c2e028f Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 15:54:02 2019 +0300 Do not open bolus screen after carbs changed commit 381d957 Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 15:45:50 2019 +0300 Limit MB if current glucose below target commit dc8b19e Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 15:30:06 2019 +0300 update version commit 8d42217 Merge: 16edb41 d2d9487 Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 15:18:07 2019 +0300 Merge branch 'LoopKit-dev' into dev-ivan # Conflicts: # Cartfile.resolved commit d2d9487 Merge: a24eeb5 ac31e0b Author: Ivan Valkou <[email protected]> Date: Sat Nov 30 15:16:26 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev commit 16edb41 Author: Ivan Valkou <[email protected]> Date: Sat Nov 23 17:10:31 2019 +0300 Bolus recommendation notice cancels a microbolus commit bc10d13 Merge: 8cddb00 22543b8 Author: Ivan Valkou <[email protected]> Date: Sat Nov 23 16:01:04 2019 +0300 Merge branch 'empty-settings-fix' into dev-ivan # Conflicts: # Cartfile.resolved commit 22543b8 Author: Ivan Valkou <[email protected]> Date: Sat Nov 23 16:00:02 2019 +0300 Fixed loss of settings after reboot. commit 8cddb00 Merge: 10f581e e1bcfd4 Author: Ivan Valkou <[email protected]> Date: Sat Nov 23 15:36:48 2019 +0300 Merge branch 'current-time-lines' into dev-ivan # Conflicts: # Cartfile.resolved commit e1bcfd4 Author: Ivan <[email protected]> Date: Sat Nov 23 14:57:05 2019 +0300 Current time line on charts (LoopKit#6) commit a24eeb5 Merge: 430d9ab 49412b6 Author: Ivan Valkou <[email protected]> Date: Sat Nov 23 15:29:38 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev # Conflicts: # Cartfile.resolved commit b0869d0 Merge: 430d9ab 49412b6 Author: Ivan Valkou <[email protected]> Date: Sat Nov 23 15:28:48 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev # Conflicts: # Cartfile.resolved commit 10f581e Author: Ivan <[email protected]> Date: Sat Nov 23 14:57:05 2019 +0300 Current time line on charts (LoopKit#6) commit 0c25618 Author: Ivan Valkou <[email protected]> Date: Fri Nov 15 14:37:22 2019 +0300 Revert "revert notification names" This reverts commit ad62a80. commit f4b6aaa Author: Ivan Valkou <[email protected]> Date: Fri Nov 15 14:16:25 2019 +0300 update cartfile commit 959fe30 Author: Ivan Valkou <[email protected]> Date: Wed Nov 13 17:26:27 2019 +0300 MB with COB and without COB work independently commit ad62a80 Author: Ivan Valkou <[email protected]> Date: Tue Nov 12 11:31:21 2019 +0300 revert notification names commit c9ee230 Merge: 0194ea2 430d9ab Author: Ivan Valkou <[email protected]> Date: Tue Nov 12 11:23:57 2019 +0300 Merge branch 'dev' into dev-ivan # Conflicts: # Cartfile.resolved commit 0194ea2 Author: Ivan Valkou <[email protected]> Date: Tue Nov 12 11:22:48 2019 +0300 Cartfile.resolved commit 430d9ab Author: Pete Schwamb <[email protected]> Date: Thu Nov 7 00:26:24 2019 -0600 Notification names changed in LoopKit (LoopKit#1165) * Notification names changed in LoopKit * Bump carthage revs commit abed78f Author: David Thornley <[email protected]> Date: Mon Nov 11 11:26:27 2019 +0100 Add ability to define a lower limit before performing the bolus (LoopKit#4) * Log what is being recommended. * Fix typos * Add a user configurable minimum bolus limit to allow the user to prevent the delivering of very small 0.05 unit boluses * Update message and the display format of the values for minimum units to deliver commit 2a2b02e Author: Ivan Valkou <[email protected]> Date: Sat Nov 9 15:01:21 2019 +0300 Fix texts commit 1fb94ef Author: Ivan Valkou <[email protected]> Date: Thu Nov 7 19:50:39 2019 +0300 Safe Mode refactored commit 06021b8 Author: Ivan Valkou <[email protected]> Date: Thu Nov 7 16:16:32 2019 +0300 nonlinear-carb-model commit e755e1c Author: Ivan Valkou <[email protected]> Date: Wed Nov 6 22:47:13 2019 +0300 Revert "Carb Absorption Model UI" This reverts commit 1a94f7f. commit 1a94f7f Author: Ivan Valkou <[email protected]> Date: Wed Nov 6 20:56:34 2019 +0300 Carb Absorption Model UI commit ca202c8 Author: Ivan Valkou <[email protected]> Date: Sun Nov 3 01:31:10 2019 +0300 Microboluses Safe Mode commit f646063 Author: Ivan Valkou <[email protected]> Date: Sat Nov 2 13:20:46 2019 +0300 Add 15 min control clucose chek commit 785a909 Author: Ivan Valkou <[email protected]> Date: Sat Nov 2 11:05:20 2019 +0300 Fix MB without COM commit 7ee1917 Author: Ivan Valkou <[email protected]> Date: Fri Nov 1 21:41:17 2019 +0300 Bump version commit a4ebeb1 Author: Ivan <[email protected]> Date: Fri Nov 1 21:37:48 2019 +0300 Microbolus screen (LoopKit#3) * draft UI * New Microboluses Screen commit 9fdd8c2 Author: Ivan Valkou <[email protected]> Date: Thu Oct 31 11:56:03 2019 +0300 build version changed commit 5e158aa Author: Ivan Valkou <[email protected]> Date: Wed Oct 30 17:59:49 2019 +0300 disable Microboluses if closed loop disabled commit 13db3d2 Author: Ivan Valkou <[email protected]> Date: Tue Oct 29 21:18:09 2019 +0300 misprint fixed commit 2d843b6 Author: Ivan Valkou <[email protected]> Date: Mon Oct 28 18:07:45 2019 +0300 little refactor commit f7047f3 Author: Ivan Valkou <[email protected]> Date: Mon Oct 28 16:51:35 2019 +0300 fix 0 bolus bug commit 3d17aa2 Author: Ivan Valkou <[email protected]> Date: Mon Oct 28 12:11:35 2019 +0300 spikeapp scheme supported commit c621ec1 Author: Ivan Valkou <[email protected]> Date: Sun Oct 27 16:47:27 2019 +0300 Fix version & skip bolus screen on Watch commit b7b1374 Merge: 5f9df78 91a834f Author: Ivan Valkou <[email protected]> Date: Sun Oct 27 15:10:18 2019 +0300 Merge branch 'dev' into dev-ivan commit 91a834f Merge: fa494fe 3aa8e6e Author: Ivan Valkou <[email protected]> Date: Sun Oct 27 15:09:21 2019 +0300 Merge branch 'LoopKit-dev' into dev commit 3aa8e6e Merge: fa494fe 9407f8c Author: Ivan Valkou <[email protected]> Date: Sun Oct 27 15:08:56 2019 +0300 Merge branch 'dev' of https://github.com/LoopKit/Loop into LoopKit-dev # Conflicts: # Cartfile.resolved commit 5f9df78 Author: Ivan Valkou <[email protected]> Date: Fri Oct 25 16:40:06 2019 +0300 rewrite loop() commit 82fc9b6 Author: Ivan Valkou <[email protected]> Date: Fri Oct 25 11:47:19 2019 +0300 Max Microbolus Size title commit 2deafd3 Author: Ivan Valkou <[email protected]> Date: Thu Oct 24 22:14:06 2019 +0300 Microbolus refactoring commit 4205e97 Author: Ivan Valkou <[email protected]> Date: Thu Oct 24 19:48:19 2019 +0300 do not show bolus screen if microboluses is enabled commit e40731e Author: Ivan Valkou <[email protected]> Date: Thu Oct 24 18:58:03 2019 +0300 Fix explanation of MB commit c3f0cb8 Author: Ivan Valkou <[email protected]> Date: Thu Oct 24 18:51:38 2019 +0300 Microboluses in settings commit 56f151f Author: Ivan Valkou <[email protected]> Date: Thu Oct 24 13:37:58 2019 +0300 Micro Boluses! commit 6190e2d Author: Ivan Valkou <[email protected]> Date: Wed Oct 23 20:07:12 2019 +0300 NSAllowsArbitraryLoads commit d349c8f Author: Ivan Valkou <[email protected]> Date: Wed Oct 23 16:38:16 2019 +0300 Cartfile update commit 43e4d8c Author: Ivan Valkou <[email protected]> Date: Wed Oct 23 16:36:03 2019 +0300 NightscoutAPIClient added commit fa494fe Author: Pete Schwamb <[email protected]> Date: Sun Oct 13 11:00:22 2019 -0500 Remote overrides (LoopKit#1131) * Allow overrides to be enabled via APNs * Update to NS sent notifications * Cleanup prints * Query override history for NS upload * Bump submodule revs * Handle indefinite duration override treatment uploads * Use separate representation for indefinite duration treatments * Bump cartfile rev * Send any override changes when uploading loop status * Bump carthage revisions * Bump carthage revision * Fix typo, and log device token * Carthage dependency revisions commit d653500 Author: Pete Schwamb <[email protected]> Date: Sun Oct 13 09:28:16 2019 -0500 New strategy for asset overrides. Fixes popup warnings (LoopKit#1145) * New strategy for asset overrides. Fixes popup warnings * Add DefaultAssets.xcassets back to WatchApp target commit af99248 Author: Pete Schwamb <[email protected]> Date: Sun Oct 13 08:58:10 2019 -0500 Fix issue with PumpManager ble update coming in right after cgm update arrives (LoopKit#1096) commit 255a7de Author: katie disimone <[email protected]> Date: Sun Oct 13 06:53:42 2019 -0700 display - for HUD CGM when value is >15 min old (LoopKit#1140) commit 2c948ec Author: katie disimone <[email protected]> Date: Sun Oct 13 06:42:28 2019 -0700 hide the saved API secret by default in NS services display (LoopKit#1142)
1 parent e666764 commit abffbb8

File tree

14 files changed

+862
-34
lines changed

14 files changed

+862
-34
lines changed

‎Common/Models/WatchContext.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ final class WatchContext: RawRepresentable {
3131
var lastNetTempBasalDose: Double?
3232
var lastNetTempBasalDate: Date?
3333
var recommendedBolusDose: Double?
34+
var doNotOpenBolusScreenWithMicroboluses: Bool?
3435

3536
var cob: Double?
3637
var iob: Double?
@@ -68,6 +69,7 @@ final class WatchContext: RawRepresentable {
6869
lastNetTempBasalDate = rawValue["bad"] as? Date
6970
recommendedBolusDose = rawValue["rbo"] as? Double
7071
cob = rawValue["cob"] as? Double
72+
doNotOpenBolusScreenWithMicroboluses = rawValue["mb"] as? Bool
7173

7274
cgmManagerState = rawValue["cgmManagerState"] as? CGMManager.RawStateValue
7375

@@ -100,6 +102,7 @@ final class WatchContext: RawRepresentable {
100102
raw["r"] = reservoir
101103
raw["rbo"] = recommendedBolusDose
102104
raw["rp"] = reservoirPercentage
105+
raw["mb"] = doNotOpenBolusScreenWithMicroboluses
103106

104107
raw["pg"] = predictedGlucose?.rawValue
105108

‎Loop.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
/* Begin PBXBuildFile section */
2525
2E3484B7230607D700B11C92 /* SpikeClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E3484B5230607D700B11C92 /* SpikeClient.framework */; };
2626
2E3484B8230607D700B11C92 /* SpikeClientUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E3484B6230607D700B11C92 /* SpikeClientUI.framework */; };
27+
3804343D23747354004BAB52 /* Microbolus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3804343C23747354004BAB52 /* Microbolus.swift */; };
28+
3804343E237474AE004BAB52 /* Microbolus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3804343C23747354004BAB52 /* Microbolus.swift */; };
29+
38BE6D8D236C8A110074CF11 /* MicrobolusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BE6D8C236C8A110074CF11 /* MicrobolusViewController.swift */; };
30+
38CE2218236B134F00DFE990 /* MicrobolusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38CE2217236B134F00DFE990 /* MicrobolusView.swift */; };
2731
43027F0F1DFE0EC900C51989 /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F526D5E1DF2459000A04910 /* HKUnit.swift */; };
2832
4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */; };
2933
4302F4E31D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */; };
@@ -240,7 +244,6 @@
240244
43E2D8F41D20C0DB004DA55F /* recommend_temp_basal_start_high_end_low.json in Resources */ = {isa = PBXBuildFile; fileRef = 43E2D8E91D20C0DB004DA55F /* recommend_temp_basal_start_high_end_low.json */; };
241245
43E2D8F51D20C0DB004DA55F /* recommend_temp_basal_start_low_end_high.json in Resources */ = {isa = PBXBuildFile; fileRef = 43E2D8EA1D20C0DB004DA55F /* recommend_temp_basal_start_low_end_high.json */; };
242246
43E2D8F61D20C0DB004DA55F /* recommend_temp_basal_start_low_end_in_range.json in Resources */ = {isa = PBXBuildFile; fileRef = 43E2D8EB1D20C0DB004DA55F /* recommend_temp_basal_start_low_end_in_range.json */; };
243-
43E2D9151D20C5A2004DA55F /* KeychainManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E2D8C91D20B9E7004DA55F /* KeychainManagerTests.swift */; };
244247
43E2D9191D222759004DA55F /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; };
245248
43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */; };
246249
43E93FB51E4675E800EAB8DB /* NumberFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43BFF0B31E45C1BE00FF19A9 /* NumberFormatter.swift */; };
@@ -571,6 +574,9 @@
571574
/* Begin PBXFileReference section */
572575
2E3484B5230607D700B11C92 /* SpikeClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpikeClient.framework; path = Carthage/Build/iOS/SpikeClient.framework; sourceTree = "<group>"; };
573576
2E3484B6230607D700B11C92 /* SpikeClientUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpikeClientUI.framework; path = Carthage/Build/iOS/SpikeClientUI.framework; sourceTree = "<group>"; };
577+
3804343C23747354004BAB52 /* Microbolus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Microbolus.swift; sourceTree = "<group>"; };
578+
38BE6D8C236C8A110074CF11 /* MicrobolusViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrobolusViewController.swift; sourceTree = "<group>"; };
579+
38CE2217236B134F00DFE990 /* MicrobolusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrobolusView.swift; sourceTree = "<group>"; };
574580
4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewController.swift; sourceTree = "<group>"; };
575581
4302F4E21D4EA54200F0FCAF /* InsulinDeliveryTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDeliveryTableViewController.swift; sourceTree = "<group>"; };
576582
430B29892041F54A00BA9F93 /* NSUserDefaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSUserDefaults.swift; sourceTree = "<group>"; };
@@ -1526,6 +1532,7 @@
15261532
43D848AF1E7DCBE100DADCBC /* Result.swift */,
15271533
43D9FFD121EAE05D00AF44BF /* LoopCore.h */,
15281534
43D9FFD221EAE05D00AF44BF /* Info.plist */,
1535+
3804343C23747354004BAB52 /* Microbolus.swift */,
15291536
);
15301537
path = LoopCore;
15311538
sourceTree = "<group>";
@@ -1613,6 +1620,7 @@
16131620
43E3449E1B9D68E900C85C07 /* StatusTableViewController.swift */,
16141621
4302F4E01D4E9C8900F0FCAF /* TextFieldTableViewController.swift */,
16151622
89CA2B31226C18B8004D9350 /* TestingScenariosTableViewController.swift */,
1623+
38BE6D8C236C8A110074CF11 /* MicrobolusViewController.swift */,
16161624
);
16171625
path = "View Controllers";
16181626
sourceTree = "<group>";
@@ -1632,6 +1640,7 @@
16321640
43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
16331641
4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
16341642
439706E522D2E84900C81566 /* PredictionSettingTableViewCell.swift */,
1643+
38CE2217236B134F00DFE990 /* MicrobolusView.swift */,
16351644
);
16361645
path = Views;
16371646
sourceTree = "<group>";
@@ -2648,6 +2657,7 @@
26482657
43B260491ED248FB008CAA77 /* CarbEntryTableViewCell.swift in Sources */,
26492658
4302F4E11D4E9C8900F0FCAF /* TextFieldTableViewController.swift in Sources */,
26502659
43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */,
2660+
38CE2218236B134F00DFE990 /* MicrobolusView.swift in Sources */,
26512661
C15713821DAC6983005BC4D2 /* MealBolusNightscoutTreatment.swift in Sources */,
26522662
43FCEEA9221A615B0013DD30 /* StatusChartsManager.swift in Sources */,
26532663
43511CE321FD80E400566C63 /* StandardRetrospectiveCorrection.swift in Sources */,
@@ -2708,6 +2718,7 @@
27082718
89ADE13B226BFA0F0067222B /* TestingScenariosManager.swift in Sources */,
27092719
4F7E8ACB20E2ACB500AEA65E /* WatchPredictedGlucose.swift in Sources */,
27102720
436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */,
2721+
38BE6D8D236C8A110074CF11 /* MicrobolusViewController.swift in Sources */,
27112722
4F11D3C220DD80B3006E072C /* WatchHistoricalGlucose.swift in Sources */,
27122723
435CB6231F37967800C320C7 /* InsulinModelSettingsViewController.swift in Sources */,
27132724
4372E490213CFCE70068E043 /* LoopSettingsUserInfo.swift in Sources */,
@@ -2796,6 +2807,7 @@
27962807
isa = PBXSourcesBuildPhase;
27972808
buildActionMask = 2147483647;
27982809
files = (
2810+
3804343E237474AE004BAB52 /* Microbolus.swift in Sources */,
27992811
43C05CB821EBEA54006FB252 /* HKUnit.swift in Sources */,
28002812
4345E3F421F036FC009E00E5 /* Result.swift in Sources */,
28012813
43D9002021EB209400AF44BF /* NSTimeInterval.swift in Sources */,
@@ -2848,6 +2860,7 @@
28482860
isa = PBXSourcesBuildPhase;
28492861
buildActionMask = 2147483647;
28502862
files = (
2863+
3804343D23747354004BAB52 /* Microbolus.swift in Sources */,
28512864
43C05CB921EBEA54006FB252 /* HKUnit.swift in Sources */,
28522865
4345E3F521F036FC009E00E5 /* Result.swift in Sources */,
28532866
43D9FFFB21EAF3D300AF44BF /* NSTimeInterval.swift in Sources */,
@@ -2882,7 +2895,6 @@
28822895
isa = PBXSourcesBuildPhase;
28832896
buildActionMask = 2147483647;
28842897
files = (
2885-
43E2D9151D20C5A2004DA55F /* KeychainManagerTests.swift in Sources */,
28862898
);
28872899
runOnlyForDeploymentPostprocessing = 0;
28882900
};
@@ -3542,6 +3554,7 @@
35423554
DEVELOPMENT_TEAM = "";
35433555
ENABLE_BITCODE = YES;
35443556
INFOPLIST_FILE = Loop/Info.plist;
3557+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
35453558
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
35463559
"OTHER_SWIFT_FLAGS[arch=*]" = "-DDEBUG";
35473560
"OTHER_SWIFT_FLAGS[sdk=iphonesimulator*]" = "-D IOS_SIMULATOR";
@@ -3561,6 +3574,7 @@
35613574
DEVELOPMENT_TEAM = "";
35623575
ENABLE_BITCODE = YES;
35633576
INFOPLIST_FILE = Loop/Info.plist;
3577+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
35643578
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
35653579
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER)";
35663580
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3588,6 +3602,7 @@
35883602
SWIFT_OBJC_BRIDGING_HEADER = "WatchApp Extension/Extensions/WatchApp Extension-Bridging-Header.h";
35893603
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
35903604
TARGETED_DEVICE_FAMILY = 4;
3605+
WATCHOS_DEPLOYMENT_TARGET = 6.0;
35913606
};
35923607
name = Debug;
35933608
};
@@ -3610,6 +3625,7 @@
36103625
SKIP_INSTALL = YES;
36113626
SWIFT_OBJC_BRIDGING_HEADER = "WatchApp Extension/Extensions/WatchApp Extension-Bridging-Header.h";
36123627
TARGETED_DEVICE_FAMILY = 4;
3628+
WATCHOS_DEPLOYMENT_TARGET = 6.0;
36133629
};
36143630
name = Release;
36153631
};
@@ -3631,6 +3647,7 @@
36313647
SDKROOT = watchos;
36323648
SKIP_INSTALL = YES;
36333649
TARGETED_DEVICE_FAMILY = 4;
3650+
WATCHOS_DEPLOYMENT_TARGET = 6.0;
36343651
};
36353652
name = Debug;
36363653
};
@@ -3652,6 +3669,7 @@
36523669
SDKROOT = watchos;
36533670
SKIP_INSTALL = YES;
36543671
TARGETED_DEVICE_FAMILY = 4;
3672+
WATCHOS_DEPLOYMENT_TARGET = 6.0;
36553673
};
36563674
name = Release;
36573675
};
@@ -3924,6 +3942,7 @@
39243942
DEVELOPMENT_TEAM = "";
39253943
ENABLE_BITCODE = NO;
39263944
INFOPLIST_FILE = "Loop Status Extension/Info.plist";
3945+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
39273946
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
39283947
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget";
39293948
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3946,6 +3965,7 @@
39463965
DEVELOPMENT_TEAM = "";
39473966
ENABLE_BITCODE = NO;
39483967
INFOPLIST_FILE = "Loop Status Extension/Info.plist";
3968+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
39493969
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
39503970
PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget";
39513971
PRODUCT_NAME = "$(TARGET_NAME)";

‎Loop/Managers/DeviceDataManager.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,15 @@ extension DeviceDataManager: LoopDataManagerDelegate {
672672
}
673673
)
674674
}
675+
676+
func loopDataManager(_ manager: LoopDataManager, didRecommendMicroBolus bolus: (amount: Double, date: Date), completion: @escaping (_ error: Error?) -> Void) -> Void {
677+
enactBolus(
678+
units: bolus.amount,
679+
at: bolus.date,
680+
completion: completion)
681+
}
682+
683+
var bolusState: PumpManagerStatus.BolusState? { pumpManager?.status.bolusState }
675684
}
676685

677686

0 commit comments

Comments
 (0)