From 37554b3c6f7d579b796f01f5137cfedc56d40152 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 16 Nov 2016 20:03:40 -0600 Subject: [PATCH 1/2] Do not use retrospectiveCorrection if disabled in calculating temp basal rate. --- Loop/Managers/LoopDataManager.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift index 5714acc26a..9e89414e37 100644 --- a/Loop/Managers/LoopDataManager.swift +++ b/Loop/Managers/LoopDataManager.swift @@ -539,7 +539,8 @@ final class LoopDataManager { guard lastBolus == nil, // Don't recommend changes if a bolus was just set - let tempBasal = DoseMath.recommendTempBasalFromPredictedGlucose(predictionWithRetrospectiveEffect, + let predictedGlucose = self.predictedGlucose, + let tempBasal = DoseMath.recommendTempBasalFromPredictedGlucose(predictedGlucose, lastTempBasal: lastTempBasal, maxBasalRate: maxBasal, glucoseTargetRange: glucoseTargetRange, From 9b47dd5a1d5e9ebe2cc610d9d51c1437055c5e2b Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 18 Nov 2016 16:49:59 -0600 Subject: [PATCH 2/2] bump version --- DoseMathTests/Info.plist | 2 +- Loop.xcodeproj/project.pbxproj | 4 ++-- Loop/Info.plist | 2 +- LoopTests/Info.plist | 2 +- WatchApp Extension/Info.plist | 2 +- WatchApp/Info.plist | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist index f124e5ad28..d5f492a070 100644 --- a/DoseMathTests/Info.plist +++ b/DoseMathTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index 485e21925a..29c3ddc62a 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -1230,7 +1230,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 29; + CURRENT_PROJECT_VERSION = 30; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1282,7 +1282,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: loudnate@gmail.com (XZN842LDLT)"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 29; + CURRENT_PROJECT_VERSION = 30; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; diff --git a/Loop/Info.plist b/Loop/Info.plist index c7686315e2..95b3de60f4 100644 --- a/Loop/Info.plist +++ b/Loop/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist index f124e5ad28..d5f492a070 100644 --- a/LoopTests/Info.plist +++ b/LoopTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion diff --git a/WatchApp Extension/Info.plist b/WatchApp Extension/Info.plist index 633665ad40..e969aafdc6 100644 --- a/WatchApp Extension/Info.plist +++ b/WatchApp Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist index 061d605924..f707c3382e 100644 --- a/WatchApp/Info.plist +++ b/WatchApp/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion