From 4e7be3eb0e168ebb9d2233440b10a8cd61e9f5ab Mon Sep 17 00:00:00 2001 From: iMaces Date: Sat, 8 Apr 2017 01:43:52 -0300 Subject: [PATCH 1/6] Personal Settings --- Loop.xcconfig | 2 +- Loop.xcodeproj/project.pbxproj | 16 ++++++++-------- Loop/Managers/DeviceDataManager.swift | 5 ++++- .../Controllers/BolusInterfaceController.swift | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Loop.xcconfig b/Loop.xcconfig index d092e89a38..7679c66fa3 100644 --- a/Loop.xcconfig +++ b/Loop.xcconfig @@ -8,4 +8,4 @@ // Change this on first setup to your own unique organization identifier in // reverse-domain name syntax. -MAIN_APP_BUNDLE_IDENTIFIER = com.loopkit +MAIN_APP_BUNDLE_IDENTIFIER = com.moncton diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index a9707b2501..410ac7b3ea 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -1809,7 +1809,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = Loop/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; "OTHER_SWIFT_FLAGS[sdk=iphonesimulator*]" = "-D IOS_SIMULATOR"; @@ -1826,7 +1826,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Loop/Loop.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = Loop/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER)"; @@ -1841,7 +1841,7 @@ ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -1859,7 +1859,7 @@ ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -1878,7 +1878,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1898,7 +1898,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1976,7 +1976,7 @@ CODE_SIGN_ENTITLEMENTS = "Loop Status Extension/Loop Status Extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = "Loop Status Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget"; @@ -1996,7 +1996,7 @@ CODE_SIGN_ENTITLEMENTS = "Loop Status Extension/Loop Status Extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = "Loop Status Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget"; diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index 06565eb875..109accb5b5 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -707,7 +707,10 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate { // MARK: - GlucoseKit - let glucoseStore = GlucoseStore() + let glucoseStore: GlucoseStore + func glucoseStore(_ glucoseStore: GlucoseStore){ + glucoseStore.managedDataInterval = nil + } // MARK: - InsulinKit diff --git a/WatchApp Extension/Controllers/BolusInterfaceController.swift b/WatchApp Extension/Controllers/BolusInterfaceController.swift index 0dfd6a2444..c5e93d8028 100644 --- a/WatchApp Extension/Controllers/BolusInterfaceController.swift +++ b/WatchApp Extension/Controllers/BolusInterfaceController.swift @@ -94,7 +94,7 @@ final class BolusInterfaceController: WKInterfaceController, IdentifiableClass { } let recommendedPickerValue = pickerValueFromBolusValue(recommendedBolus) - pickerValue = Int(Double(recommendedPickerValue) * 0.75) + pickerValue = Int(Double(recommendedPickerValue) * 1) if let valueString = formatter.string(from: NSNumber(value: recommendedBolus)) { recommendedValueLabel.setText(String(format: NSLocalizedString("Rec: %@ U", comment: "The label and value showing the recommended bolus"), valueString).localizedUppercase) From f02e2b1cb120de6881d5d71303428708b85de570 Mon Sep 17 00:00:00 2001 From: iMaces Date: Sat, 8 Apr 2017 02:14:09 -0300 Subject: [PATCH 2/6] Fix of GlucosStore --- Loop/Managers/DeviceDataManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index 109accb5b5..d80e401f47 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -707,7 +707,7 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate { // MARK: - GlucoseKit - let glucoseStore: GlucoseStore + let glucoseStore = GlucoseStore() func glucoseStore(_ glucoseStore: GlucoseStore){ glucoseStore.managedDataInterval = nil } From 7efe468fa66d32ee03c7de2f9991c8709e5a86a5 Mon Sep 17 00:00:00 2001 From: iMaces Date: Mon, 10 Apr 2017 22:39:53 -0300 Subject: [PATCH 3/6] Disable CGM deletion from HealthKit for Enlite --- Loop/Managers/DeviceDataManager.swift | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index d80e401f47..efeb26de4e 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -708,9 +708,6 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate { // MARK: - GlucoseKit let glucoseStore = GlucoseStore() - func glucoseStore(_ glucoseStore: GlucoseStore){ - glucoseStore.managedDataInterval = nil - } // MARK: - InsulinKit @@ -749,6 +746,8 @@ final class DeviceDataManager: CarbStoreDelegate, DoseStoreDelegate { init() { let pumpID = UserDefaults.standard.pumpID + + glucoseStore?.managedDataInterval = nil doseStore = DoseStore( pumpID: pumpID, From 334c5d448785a5f484ed095fa95c49879205db13 Mon Sep 17 00:00:00 2001 From: iMaces Date: Sun, 14 May 2017 22:49:42 -0700 Subject: [PATCH 4/6] Change location of code for Elite CGM to keep history --- Loop/Managers/DeviceDataManager.swift | 2 -- Loop/Managers/LoopDataManager.swift | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift index 6f9fead40d..a18e681e67 100644 --- a/Loop/Managers/DeviceDataManager.swift +++ b/Loop/Managers/DeviceDataManager.swift @@ -588,8 +588,6 @@ final class DeviceDataManager { init() { let pumpID = UserDefaults.standard.pumpID - - glucoseStore?.managedDataInterval = nil var idleListeningEnabled = true diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift index 79a3a84f41..db493322fa 100644 --- a/Loop/Managers/LoopDataManager.swift +++ b/Loop/Managers/LoopDataManager.swift @@ -92,6 +92,7 @@ final class LoopDataManager { UserDefaults.standard.loopSettings = settings notify(forChange: .preferences) AnalyticsManager.sharedManager.didChangeLoopSettings(from: oldValue, to: settings) + glucoseStore?.managedDataInterval = nil } } From f05e19ccf8308fd10c204847ec5fd1186158f7ad Mon Sep 17 00:00:00 2001 From: iMaces Date: Fri, 19 May 2017 00:38:17 -0700 Subject: [PATCH 5/6] Fixing Elite CGM integration --- Loop/Managers/CGM/EnliteCGMManager.swift | 3 +++ Loop/Managers/LoopDataManager.swift | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Loop/Managers/CGM/EnliteCGMManager.swift b/Loop/Managers/CGM/EnliteCGMManager.swift index 76371f2ceb..4e9387050c 100644 --- a/Loop/Managers/CGM/EnliteCGMManager.swift +++ b/Loop/Managers/CGM/EnliteCGMManager.swift @@ -35,6 +35,9 @@ final class EnliteCGMManager: CGMManager { device.getGlucoseHistoryEvents(since: latestGlucoseDate.addingTimeInterval(TimeInterval(minutes: 1))) { (result) in switch result { case .success(let events): + + _ = deviceManager.remoteDataManager.nightscoutService.uploader?.processGlucoseEvents(events, source: device.device.deviceURI) + if let latestSensorEvent = events.flatMap({ $0.glucoseEvent as? RelativeTimestampedGlucoseEvent }).last { self.sensorState = EnliteSensorDisplayable(latestSensorEvent) } diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift index db493322fa..c26529f776 100644 --- a/Loop/Managers/LoopDataManager.swift +++ b/Loop/Managers/LoopDataManager.swift @@ -51,6 +51,7 @@ final class LoopDataManager { self.delegate = delegate self.lastLoopCompleted = lastLoopCompleted self.settings = settings + glucoseStore?.managedDataInterval = nil carbStore = CarbStore( defaultAbsorptionTimes: ( @@ -92,7 +93,6 @@ final class LoopDataManager { UserDefaults.standard.loopSettings = settings notify(forChange: .preferences) AnalyticsManager.sharedManager.didChangeLoopSettings(from: oldValue, to: settings) - glucoseStore?.managedDataInterval = nil } } From f7cf375ac5292db301cfcd77c9bdaca724aea5c4 Mon Sep 17 00:00:00 2001 From: iMaces Date: Wed, 19 Jul 2017 15:18:34 -0300 Subject: [PATCH 6/6] New Personal Updates to DEV --- Loop.xcodeproj/project.pbxproj | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj index 7dcb46e333..ba4333df27 100644 --- a/Loop.xcodeproj/project.pbxproj +++ b/Loop.xcodeproj/project.pbxproj @@ -1936,7 +1936,7 @@ buildSettings = { CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = DoseMathTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.DoseMathTests; @@ -1949,7 +1949,7 @@ buildSettings = { CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = DoseMathTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.DoseMathTests; @@ -1963,7 +1963,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = LoopTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.LoopTests; @@ -1978,7 +1978,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; INFOPLIST_FILE = LoopTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.loudnate.LoopTests; @@ -2034,10 +2034,10 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 37; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 37; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -2065,7 +2065,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 37; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 9UE6WS8Z6P; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 37; DYLIB_INSTALL_NAME_BASE = "@rpath";