Skip to content

Version 0.9.0 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 6, 2016
Merged

Version 0.9.0 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5dbbe30
Cleaning up SettingsTableViewController a bit
loudnate Jul 31, 2016
ce7f8cc
Merge pull request #94 from loudnate/settings-cleanup
loudnate Jul 31, 2016
0cb7a98
Updating to LoopKit 0.4.0 (#95)
loudnate Aug 1, 2016
6a238eb
Fixing glucose trend on the watch
loudnate Aug 2, 2016
910233e
Reporting pump status from x22 devices (#99)
ps2 Aug 4, 2016
60c98e5
Adjustments to pump status uploading: (#101)
loudnate Aug 5, 2016
2be6d40
Update G4ShareSpy to 0.2.1 (#102)
mddub Aug 6, 2016
640e45f
Fixing the watch description (#103)
loudnate Aug 6, 2016
6870b09
reservoir change analytics, readme update (#105)
loudnate Aug 6, 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
6 changes: 3 additions & 3 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "loudnate/LoopKit" ~> 0.3.5
github "loudnate/LoopKit" ~> 0.4.0
github "loudnate/xDripG5" ~> 0.5.0
github "loudnate/SwiftCharts" "loudnate/naterade"
github "mddub/dexcom-share-client-swift" ~> 0.1
github "mddub/G4ShareSpy" ~> 0.2
github "ps2/rileylink_ios" ~> 0.7.1
github "mddub/G4ShareSpy" ~> 0.2.1
github "ps2/rileylink_ios" ~> 0.8.0
github "amplitude/Amplitude-iOS" "mpurland-framework"
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
github "mddub/G4ShareSpy" "v0.2.0"
github "loudnate/LoopKit" "v0.3.5"
github "mddub/G4ShareSpy" "v0.2.1"
github "loudnate/LoopKit" "v0.4.0"
github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
github "mddub/dexcom-share-client-swift" "v0.1.3"
github "loudnate/xDripG5" "0.5.0"
github "ps2/rileylink_ios" "v0.7.1"
github "ps2/rileylink_ios" "v0.8.0"
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...age/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...hage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified ...sulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h
View file
Open in desktop

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
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/InsulinKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Assets.car
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h
View file
Open in desktop

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

Binary file modified Carthage/Build/iOS/LoopKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/LoopKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/MinimedKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified ...ld/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified ...iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified .../iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified ...S/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified ...d/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified ...OS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified ...iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified .../NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified ...hage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Documentation/Screenshots/Watch Carb Entry.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 20 additions & 20 deletions DoseMathTests/DoseMathTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ class RecommendTempBasalTests: XCTestCase {

// Cancel existing temp basal
let lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 0.125,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand Down Expand Up @@ -167,11 +167,11 @@ class RecommendTempBasalTests: XCTestCase {
XCTAssertNil(dose)

let lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 1.225,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand Down Expand Up @@ -205,11 +205,11 @@ class RecommendTempBasalTests: XCTestCase {

// Ignore due to existing dose
var lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 0.125,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand All @@ -225,11 +225,11 @@ class RecommendTempBasalTests: XCTestCase {

// Cancel existing dose
lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 1.225,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand All @@ -246,11 +246,11 @@ class RecommendTempBasalTests: XCTestCase {

// Continue existing dose
lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)),
value: 0.125,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand Down Expand Up @@ -279,11 +279,11 @@ class RecommendTempBasalTests: XCTestCase {
XCTAssertNil(dose)

lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)),
value: 0.125,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand Down Expand Up @@ -345,11 +345,11 @@ class RecommendTempBasalTests: XCTestCase {
XCTAssertNil(dose)

let lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 1.225,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
Expand Down Expand Up @@ -528,11 +528,11 @@ class RecommendBolusTests: XCTestCase {

// Don't consider net-negative temp basal
let lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 0.01,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
Expand Down Expand Up @@ -638,11 +638,11 @@ class RecommendBolusTests: XCTestCase {

// Less existing temp
var lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
value: 1.225,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
Expand All @@ -658,11 +658,11 @@ class RecommendBolusTests: XCTestCase {

// But not a finished temp
lastTempBasal = DoseEntry(
type: .TempBasal,
type: .tempBasal,
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -35)),
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -5)),
value: 1.225,
unit: .UnitsPerHour
unit: .unitsPerHour
)

dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
Expand Down
Loading