Skip to content

Commit 6c70810

Browse files
marionbarkermarionbarker
committed
update 1988 and 2008 for commit 6a9aa44 and later
1 parent 0c722b6 commit 6c70810

File tree

6 files changed

+272
-233
lines changed

6 files changed

+272
-233
lines changed

‎1988/dev_1988.patch

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Submodule Loop fee85e0..66723d6:
1+
Submodule Loop 3034e45..b9c7cec:
22
diff --git a/Loop/Loop.xcodeproj/project.pbxproj b/Loop/Loop.xcodeproj/project.pbxproj
3-
index 360db94c..f403686e 100644
3+
index d9e48718..0d2dda5e 100644
44
--- a/Loop/Loop.xcodeproj/project.pbxproj
55
+++ b/Loop/Loop.xcodeproj/project.pbxproj
6-
@@ -516,6 +516,11 @@
6+
@@ -518,6 +518,11 @@
77
C1FB428D21791D2500FAB378 /* PumpManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43C3B6F620BBCAA30026CAFA /* PumpManager.swift */; };
88
C1FB428F217921D600FAB378 /* PumpManagerUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428E217921D600FAB378 /* PumpManagerUI.swift */; };
99
C1FB4290217922A100FAB378 /* PumpManagerUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1FB428E217921D600FAB378 /* PumpManagerUI.swift */; };
@@ -15,7 +15,7 @@ index 360db94c..f403686e 100644
1515
E90909D124E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json in Resources */ = {isa = PBXBuildFile; fileRef = E90909CC24E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json */; };
1616
E90909D224E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json in Resources */ = {isa = PBXBuildFile; fileRef = E90909CD24E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json */; };
1717
E90909D324E34AC500F963D2 /* high_and_rising_with_cob_predicted_glucose.json in Resources */ = {isa = PBXBuildFile; fileRef = E90909CE24E34AC500F963D2 /* high_and_rising_with_cob_predicted_glucose.json */; };
18-
@@ -1683,6 +1688,11 @@
18+
@@ -1687,6 +1692,11 @@
1919
C1FF3D4B29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
2020
C1FF3D4C29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = "<group>"; };
2121
C1FF3D4D29C786A900BDC1EC /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -27,23 +27,23 @@ index 360db94c..f403686e 100644
2727
E90909CC24E34AC500F963D2 /* high_and_rising_with_cob_momentum_effect.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = high_and_rising_with_cob_momentum_effect.json; sourceTree = "<group>"; };
2828
E90909CD24E34AC500F963D2 /* high_and_rising_with_cob_insulin_effect.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = high_and_rising_with_cob_insulin_effect.json; sourceTree = "<group>"; };
2929
E90909CE24E34AC500F963D2 /* high_and_rising_with_cob_predicted_glucose.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = high_and_rising_with_cob_predicted_glucose.json; sourceTree = "<group>"; };
30-
@@ -2309,6 +2319,7 @@
30+
@@ -2314,6 +2324,7 @@
3131
isa = PBXGroup;
3232
children = (
3333
A98556842493F901000FD662 /* AlertStore+SimulatedCoreData.swift */,
3434
+ DDC389FB2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift */,
3535
C1D289B422F90A52003FFBD9 /* BasalDeliveryState.swift */,
3636
A9F703722489BC8500C98AD8 /* CarbStore+SimulatedCoreData.swift */,
3737
C17824991E1999FA00D9D25C /* CaseCountable.swift */,
38-
@@ -2395,6 +2406,7 @@
38+
@@ -2400,6 +2411,7 @@
3939
43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
4040
4311FB9A1F37FE1B00D4C0A7 /* TitleSubtitleTextFieldTableViewCell.swift */,
4141
C1AF062229426300002C1B19 /* ManualGlucoseEntryRow.swift */,
4242
+ DDC389FD2A2C4C830066E2E8 /* GlucoseBasedApplicationFactorSelectionView.swift */,
4343
);
4444
path = Views;
4545
sourceTree = "<group>";
46-
@@ -2436,6 +2448,9 @@
46+
@@ -2441,6 +2453,9 @@
4747
C1F2075B26D6F9B0007AB7EB /* ProfileExpirationAlerter.swift */,
4848
A96DAC2B2838F31200D94E38 /* SharedLogging.swift */,
4949
7E69CFFB2A16A77E00203CBD /* ResetLoopManager.swift */,
@@ -53,39 +53,39 @@ index 360db94c..f403686e 100644
5353
);
5454
path = Managers;
5555
sourceTree = "<group>";
56-
@@ -3866,6 +3881,7 @@
56+
@@ -3872,6 +3887,7 @@
5757
C1201E2C23ECDBD0002DA84A /* WatchContextRequestUserInfo.swift in Sources */,
5858
1D49795824E7289700948F05 /* ServicesViewModel.swift in Sources */,
5959
1D4A3E2D2478628500FD601B /* StoredAlert+CoreDataClass.swift in Sources */,
6060
+ DDC389FA2A2B62470066E2E8 /* ConstantDosingStrategy.swift in Sources */,
6161
892D7C5123B54A15008A9656 /* CarbEntryViewController.swift in Sources */,
6262
B4E202302661063E009421B5 /* AutomaticDosingStatus.swift in Sources */,
6363
C191D2A125B3ACAA00C26C0B /* DosingStrategySelectionView.swift in Sources */,
64-
@@ -3897,6 +3913,7 @@
64+
@@ -3903,6 +3919,7 @@
6565
1DB619AC270BAD3D006C9D07 /* VersionUpdateViewModel.swift in Sources */,
6666
A9C62D882331703100535612 /* Service.swift in Sources */,
6767
89CAB36324C8FE96009EE3CE /* PredictedGlucoseChartView.swift in Sources */,
6868
+ DDC389F82A2B620B0066E2E8 /* GlucoseBasedApplicationFactorStrategy.swift in Sources */,
6969
4F6663941E905FD2009E74FC /* ChartColorPalette+Loop.swift in Sources */,
7070
A9F703732489BC8500C98AD8 /* CarbStore+SimulatedCoreData.swift in Sources */,
7171
4328E0351CFC0AE100E199AA /* WatchDataManager.swift in Sources */,
72-
@@ -3926,6 +3943,7 @@
72+
@@ -3933,6 +3950,7 @@
7373
E9B080B1253BDA6300BAD8F8 /* UserDefaults+LoopIntents.swift in Sources */,
7474
C1AF062329426300002C1B19 /* ManualGlucoseEntryRow.swift in Sources */,
7575
C148CEE724FD91BD00711B3B /* DeliveryUncertaintyAlertManager.swift in Sources */,
7676
+ DDC389FC2A2BC6670066E2E8 /* SettingsView+algorithmExperimentsSection.swift in Sources */,
7777
1D12D3B92548EFDD00B53E8B /* main.swift in Sources */,
7878
435400341C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */,
7979
A9DCF32A25B0FABF00C89088 /* LoopUIColorPalette+Default.swift in Sources */,
80-
@@ -3960,6 +3978,7 @@
80+
@@ -3967,6 +3985,7 @@
8181
A97F250825E056D500F0EE19 /* OnboardingManager.swift in Sources */,
8282
438D42F91D7C88BC003244B0 /* PredictionInputEffect.swift in Sources */,
8383
892A5D692230C41D008961AB /* RangeReplaceableCollection.swift in Sources */,
8484
+ DDC389F62A2B61750066E2E8 /* ApplicationFactorStrategy.swift in Sources */,
8585
4F70C2101DE8FAC5006380B7 /* ExtensionDataManager.swift in Sources */,
8686
43DFB62320D4CAE7008A7BAE /* PumpManager.swift in Sources */,
8787
A9FB75F1252BE320004C7D3F /* BolusDosingDecision.swift in Sources */,
88-
@@ -3967,6 +3986,7 @@
88+
@@ -3974,6 +3993,7 @@
8989
431A8C401EC6E8AB00823B9C /* CircleMaskView.swift in Sources */,
9090
1D05219D2469F1F5000EBBDE /* AlertStore.swift in Sources */,
9191
439897371CD2F80600223065 /* AnalyticsServicesManager.swift in Sources */,
@@ -235,7 +235,7 @@ index ffc66ee3..1b1bab1f 100644
235235
@@ -1698,7 +1698,23 @@ extension LoopDataManager {
236236
return self.delegate?.roundBolusVolume(units: units) ?? units
237237
}
238-
238+
239239
- let maxAutomaticBolus = min(iobHeadroom, maxBolus! * LoopConstants.bolusPartialApplicationFactor)
240240
+ // Create dosing strategy based on user setting
241241
+ let applicationFactorStrategy: ApplicationFactorStrategy = UserDefaults.standard.bool(forKey: "applyExperimentalGlucoseBasedApplicationFactor")
@@ -251,10 +251,10 @@ index ffc66ee3..1b1bab1f 100644
251251
+ )
252252
+
253253
+ self.logger.debug(" *** Glucose: %{public}@, effectiveBolusApplicationFactor: %.2f", glucose.quantity.description, effectiveBolusApplicationFactor)
254-
+
254+
+
255255
+ // If a user customizes maxPartialApplicationFactor > 1; this respects maxBolus
256256
+ let maxAutomaticBolus = min(iobHeadroom, maxBolus! * min(effectiveBolusApplicationFactor, 1.0))
257-
257+
258258
dosingRecommendation = predictedGlucose.recommendedAutomaticDose(
259259
to: glucoseTargetRange!,
260260
@@ -1708,7 +1724,7 @@ extension LoopDataManager {
@@ -276,7 +276,7 @@ index ffc66ee3..1b1bab1f 100644
276276
"",
277277
diff --git a/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
278278
new file mode 100644
279-
index 00000000..1e78c81e
279+
index 00000000..53ff05cd
280280
--- /dev/null
281281
+++ b/Loop/Loop/Views/GlucoseBasedApplicationFactorSelectionView.swift
282282
@@ -0,0 +1,55 @@
@@ -336,17 +336,17 @@ index 00000000..1e78c81e
336336
+ }
337337
+}
338338
diff --git a/Loop/Loop/Views/SettingsView.swift b/Loop/Loop/Views/SettingsView.swift
339-
index dc3f6ec3..24032203 100644
339+
index bd4e86e8..c8320e56 100644
340340
--- a/Loop/Loop/Views/SettingsView.swift
341341
+++ b/Loop/Loop/Views/SettingsView.swift
342342
@@ -30,6 +30,7 @@ public struct SettingsView: View {
343343
@State private var therapySettingsIsPresented: Bool = false
344344
@State private var deletePumpDataAlertIsPresented = false
345345
@State private var deleteCGMDataAlertIsPresented = false
346346
+ @State internal var isGlucoseBasedApplicationFactorEnabled = UserDefaults.standard.bool(forKey: "applyExperimentalGlucoseBasedApplicationFactor")
347-
347+
348348
var localizedAppNameAndVersion: String
349-
349+
350350
@@ -50,6 +51,9 @@ public struct SettingsView: View {
351351
if FeatureFlags.automaticBolusEnabled {
352352
dosingStrategySection

0 commit comments

Comments
 (0)