Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6df0b54
Move device-specific logic out of LoopDataManager
loudnate Jun 10, 2016
723e24e
Merge pull request #25 from loudnate/separate-concerns
loudnate Jun 10, 2016
bf12214
Merge branch 'dev' into 0.4.0
loudnate Jun 10, 2016
2b33245
Update version
loudnate Jun 10, 2016
4c779f1
Preparing for a new device setting: preferred insulin data source
loudnate Jun 11, 2016
c9e93bc
Wiring up the settings UI
loudnate Jun 11, 2016
9c1d34d
Merge pull request #27 from loudnate/preferred-insulin-data-source
loudnate Jun 12, 2016
438dc66
Merge branch 'dev' into 0.4.0
loudnate Jun 17, 2016
9ab2020
Merge branch 'dev' into 0.4.0
loudnate Jun 18, 2016
be5e092
Fetch pump history
loudnate Jun 11, 2016
218e5e6
Updating RileyLink to include history support
loudnate Jun 18, 2016
cbb7458
Fetching and storing some info about pump events.
loudnate Jun 18, 2016
e6bb30e
Updating RileyLink_ios branch
loudnate Jun 19, 2016
e1e191f
Adding missing header
loudnate Jun 19, 2016
d7c5c60
Updating rileylink_ios ref
loudnate Jun 19, 2016
654a804
Merge branch 'dev' into 0.4.0
loudnate Jun 23, 2016
a883d11
Merge branch '0.4.0' into fetch-history
loudnate Jun 23, 2016
e5e4078
Merge pull request #41 from loudnate/fetch-history
loudnate Jun 23, 2016
c5c0bd0
Updating LoopKit to dev
loudnate Jun 23, 2016
91d1624
Adding Nightscout upload calls
ps2 Jun 23, 2016
75fa34a
Adding NightscoutUploadKit.framework
ps2 Jun 23, 2016
e916d09
Add carthage copy-framework for NightscoutUploadKit
ps2 Jun 23, 2016
fed1b4a
Add documentation for Nightscout settings to README
ps2 Jun 24, 2016
b198dc5
Adding error handler for NSUploader, using observingPumpEventsSince f…
ps2 Jun 24, 2016
2d22b10
Updating RileyLink frameworks
ps2 Jun 24, 2016
85f51db
Add Crypto framework to copy-frameworks list
ps2 Jun 24, 2016
82d8f2d
revert whitespace changes
ps2 Jun 25, 2016
5b2c220
Add note about insulin data source for nightscout upload
ps2 Jun 25, 2016
d4a19e8
Updating Amplitude SDK
loudnate Jun 26, 2016
2a0822d
Merge pull request #42 from ps2/nsupload
loudnate Jun 26, 2016
393531a
Updating SDKs, temporarily renaming the history parsing preference to…
loudnate Jun 26, 2016
1ef4b7c
Merge branch '0.4.0' into amplitude-sdk
loudnate Jun 26, 2016
025cb2d
Merge pull request #43 from loudnate/amplitude-sdk
loudnate Jun 26, 2016
274f391
Merge pull request #44 from loudnate/0.4.0
loudnate Jun 26, 2016
9678ea5
Minor formatting cleanup
loudnate Jun 26, 2016
5970764
Re-adding the Carthage installation instructions
loudnate Jun 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "loudnate/LoopKit" ~> 0.3
github "loudnate/LoopKit" ~> 0.3.3
github "loudnate/xDripG5" ~> 0.5
github "loudnate/SwiftCharts" "loudnate/naterade"
github "mddub/dexcom-share-client-swift" ~> 0.1
github "ps2/rileylink_ios" ~> 0.4.0
github "ps2/rileylink_ios" ~> 0.5.0
github "amplitude/Amplitude-iOS" "mpurland-framework"
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "amplitude/Amplitude-iOS" "cde0140ac1b51f4df2619c105dbde54546c90957"
github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
github "loudnate/LoopKit" "v0.3.2"
github "loudnate/SwiftCharts" "f3e61c6193f3c19ec6b05941cdd1ba031722f461"
github "loudnate/LoopKit" "v0.3.3"
github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
github "mddub/dexcom-share-client-swift" "v0.1.3"
github "loudnate/xDripG5" "0.5.0"
github "ps2/rileylink_ios" "v0.4.0"
github "ps2/rileylink_ios" "v0.5.0"
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/CommonCrypto.framework/CommonCrypto
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Crypto
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/InsulinKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/InsulinKit
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/LoopKit
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/MinimedKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
Binary file not shown.
Binary file modified Carthage/Build/iOS/SwiftCharts.framework/SwiftCharts
Binary file not shown.
14 changes: 14 additions & 0 deletions Loop.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
435400351C9F878D00D5819C /* SetBolusUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 435400331C9F878D00D5819C /* SetBolusUserInfo.swift */; };
4354003A1C9FB81100D5819C /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DE92501C541832001FFDE1 /* UIColor.swift */; };
43649A631C7A347F00523D7F /* CollectionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43649A621C7A347F00523D7F /* CollectionType.swift */; };
436FACEC1D0BA246004E2427 /* SegmentedControlTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACEB1D0BA246004E2427 /* SegmentedControlTableViewCell.swift */; };
436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436FACED1D0BA636004E2427 /* InsulinDataSource.swift */; };
43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43776F8F1B8022E90074EA36 /* AppDelegate.swift */; };
43776F971B8022E90074EA36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43776F951B8022E90074EA36 /* Main.storyboard */; };
43776F991B8022E90074EA36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 43776F981B8022E90074EA36 /* Assets.xcassets */; };
Expand Down Expand Up @@ -124,6 +126,7 @@
43F78D591C914C57002152D1 /* recommend_temp_basal_high_and_falling.json in Resources */ = {isa = PBXBuildFile; fileRef = 43F78D581C914C57002152D1 /* recommend_temp_basal_high_and_falling.json */; };
43F78D5B1C914CAB002152D1 /* recommend_temp_basal_in_range_and_rising.json in Resources */ = {isa = PBXBuildFile; fileRef = 43F78D5A1C914CAB002152D1 /* recommend_temp_basal_in_range_and_rising.json */; };
43F78D5D1C914CEA002152D1 /* recommend_temp_basal_high_and_rising.json in Resources */ = {isa = PBXBuildFile; fileRef = 43F78D5C1C914CEA002152D1 /* recommend_temp_basal_high_and_rising.json */; };
C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -232,6 +235,8 @@
435400301C9F744E00D5819C /* BolusSuggestionUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BolusSuggestionUserInfo.swift; sourceTree = "<group>"; };
435400331C9F878D00D5819C /* SetBolusUserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetBolusUserInfo.swift; sourceTree = "<group>"; };
43649A621C7A347F00523D7F /* CollectionType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionType.swift; sourceTree = "<group>"; };
436FACEB1D0BA246004E2427 /* SegmentedControlTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SegmentedControlTableViewCell.swift; sourceTree = "<group>"; };
436FACED1D0BA636004E2427 /* InsulinDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinDataSource.swift; sourceTree = "<group>"; };
43776F8C1B8022E90074EA36 /* Loop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Loop.app; sourceTree = BUILT_PRODUCTS_DIR; };
43776F8F1B8022E90074EA36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
43776F961B8022E90074EA36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -313,6 +318,7 @@
43F78D581C914C57002152D1 /* recommend_temp_basal_high_and_falling.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_high_and_falling.json; sourceTree = "<group>"; };
43F78D5A1C914CAB002152D1 /* recommend_temp_basal_in_range_and_rising.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_in_range_and_rising.json; sourceTree = "<group>"; };
43F78D5C1C914CEA002152D1 /* recommend_temp_basal_high_and_rising.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = recommend_temp_basal_high_and_rising.json; sourceTree = "<group>"; };
C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -327,6 +333,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */,
439897391CD2F82C00223065 /* AmplitudeFramework.framework in Frameworks */,
43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */,
43EDDBF21C361C75007D89B5 /* CommonCrypto.framework in Frameworks */,
Expand Down Expand Up @@ -397,6 +404,7 @@
43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */,
4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */,
434F24CA1CFCB7AB0004498F /* GlucoseRxMessage.swift */,
436FACED1D0BA636004E2427 /* InsulinDataSource.swift */,
43C418B41CE0575200405B6A /* ShareGlucose+GlucoseKit.swift */,
434F24C81CFCA8940004498F /* TransmitterGlucose.swift */,
4328E0311CFC068900E199AA /* WatchContext+LoopKit.swift */,
Expand Down Expand Up @@ -544,6 +552,7 @@
437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */,
438DADC71CDE8F8B007697A5 /* LoopStateView.swift */,
437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */,
436FACEB1D0BA246004E2427 /* SegmentedControlTableViewCell.swift */,
43EB40C11C83F84900472A8C /* StatusChartHighlightLayer.swift */,
43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */,
);
Expand Down Expand Up @@ -598,6 +607,7 @@
968DCD53F724DE56FFE51920 /* Frameworks */ = {
isa = PBXGroup;
children = (
C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */,
43B371871CE597D10013C5A6 /* ShareClient.framework */,
439897381CD2F82C00223065 /* AmplitudeFramework.framework */,
43F78D481C914197002152D1 /* CarbKit.framework */,
Expand Down Expand Up @@ -840,6 +850,8 @@
"$(SRCROOT)/Carthage/Build/iOS/RileyLinkKit.framework",
"$(SRCROOT)/Carthage/Build/iOS/AmplitudeFramework.framework",
"$(SRCROOT)/Carthage/Build/iOS/ShareClient.framework",
"$(SRCROOT)/Carthage/Build/iOS/NightscoutUploadKit.framework",
"$(SRCROOT)/Carthage/Build/iOS/Crypto.framework",
);
outputPaths = (
);
Expand Down Expand Up @@ -874,6 +886,7 @@
43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */,
4346D1E71C77F5FE00ABAFE3 /* ChartTableViewCell.swift in Sources */,
437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */,
436FACEC1D0BA246004E2427 /* SegmentedControlTableViewCell.swift in Sources */,
43DBF0591C93F73800B3C386 /* CarbEntryTableViewController.swift in Sources */,
43DE925C1C547A20001FFDE1 /* WatchContext.swift in Sources */,
43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */,
Expand All @@ -896,6 +909,7 @@
437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */,
43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */,
4331E07A1C85650D00FBE832 /* ChartAxisValueDoubleLog.swift in Sources */,
436FACEE1D0BA636004E2427 /* InsulinDataSource.swift in Sources */,
439897371CD2F80600223065 /* AnalyticsManager.swift in Sources */,
4346D1F61C78501000ABAFE3 /* ChartPoint.swift in Sources */,
43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */,
Expand Down
Loading