Skip to content

Commit 77d94bd

Browse files
loudnateloudnate
authored
Merge pull request #104 from loudnate/dev
Version 0.9.0
2 parents 215606f + 6870b09 commit 77d94bd

File tree

108 files changed

+539
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+539
-235
lines changed

‎Cartfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
github "loudnate/LoopKit" ~> 0.3.5
1+
github "loudnate/LoopKit" ~> 0.4.0
22
github "loudnate/xDripG5" ~> 0.5.0
33
github "loudnate/SwiftCharts" "loudnate/naterade"
44
github "mddub/dexcom-share-client-swift" ~> 0.1
5-
github "mddub/G4ShareSpy" ~> 0.2
6-
github "ps2/rileylink_ios" ~> 0.7.1
5+
github "mddub/G4ShareSpy" ~> 0.2.1
6+
github "ps2/rileylink_ios" ~> 0.8.0
77
github "amplitude/Amplitude-iOS" "mpurland-framework"

‎Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
22
github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
3-
github "mddub/G4ShareSpy" "v0.2.0"
4-
github "loudnate/LoopKit" "v0.3.5"
3+
github "mddub/G4ShareSpy" "v0.2.1"
4+
github "loudnate/LoopKit" "v0.4.0"
55
github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
66
github "mddub/dexcom-share-client-swift" "v0.1.3"
77
github "loudnate/xDripG5" "0.5.0"
8-
github "ps2/rileylink_ios" "v0.7.1"
8+
github "ps2/rileylink_ios" "v0.8.0"

‎Carthage/Build/iOS/CarbKit.framework/CarbKit

-96 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib

-5 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib

-12 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib

1 Byte
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UITableViewController-rUL-yg-cFX.nib

1 Byte
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib

-2 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy

16 KB
Binary file not shown.

‎Carthage/Build/iOS/G4ShareSpy.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit

36 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc

12 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc

12 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc

12 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc

12 Bytes
Binary file not shown.

‎Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule

-48 Bytes
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib

4 Bytes
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib

1.13 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-Swift.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Carthage/Build/iOS/InsulinKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/InsulinKit

553 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc

4.16 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule

7.12 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc

4.16 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule

7.12 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc

4.16 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule

7.12 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc

4.16 KB
Binary file not shown.

‎Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule

7.12 KB
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/Assets.car

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib

-10 Bytes
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib

4 Bytes
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/Headers/LoopKit-Swift.h

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Carthage/Build/iOS/LoopKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/LoopKit

54.6 KB
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm.swiftmodule

1.66 KB
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/arm64.swiftmodule

1.66 KB
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/i386.swiftmodule

1.66 KB
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/Modules/LoopKit.swiftmodule/x86_64.swiftmodule

1.66 KB
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/RepeatingScheduleValueTableViewCell.nib

-3 Bytes
Binary file not shown.

‎Carthage/Build/iOS/LoopKit.framework/TextFieldTableViewCell.nib

668 Bytes
Binary file not shown.

‎Carthage/Build/iOS/MinimedKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/MinimedKit.framework/MinimedKit

53.5 KB
Binary file not shown.

‎Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm.swiftmodule

1.85 KB
Binary file not shown.

‎Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/arm64.swiftmodule

1.85 KB
Binary file not shown.

‎Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/i386.swiftmodule

1.85 KB
Binary file not shown.

‎Carthage/Build/iOS/MinimedKit.framework/Modules/MinimedKit.swiftmodule/x86_64.swiftmodule

1.85 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftdoc

1.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm.swiftmodule

14.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftdoc

1.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/arm64.swiftmodule

14.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftdoc

1.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/i386.swiftmodule

14.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftdoc

1.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/Modules/NightscoutUploadKit.swiftmodule/x86_64.swiftmodule

14.4 KB
Binary file not shown.

‎Carthage/Build/iOS/NightscoutUploadKit.framework/NightscoutUploadKit

1.38 MB
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkBLEKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkBLEKit.framework/RileyLinkBLEKit

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Info.plist

0 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftdoc

704 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm.swiftmodule

2.39 KB
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftdoc

704 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/arm64.swiftmodule

2.39 KB
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftdoc

704 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/i386.swiftmodule

2.39 KB
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftdoc

704 Bytes
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/Modules/RileyLinkKit.swiftmodule/x86_64.swiftmodule

2.39 KB
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkDeviceTableViewCell.nib

1 Byte
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/RileyLinkKit

120 KB
Binary file not shown.

‎Carthage/Build/iOS/RileyLinkKit.framework/TextFieldTableViewCell.nib

4 Bytes
Binary file not shown.

‎Documentation/Screenshots/Watch Carb Entry.png

514 Bytes

‎DoseMathTests/DoseMathTests.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ class RecommendTempBasalTests: XCTestCase {
119119

120120
// Cancel existing temp basal
121121
let lastTempBasal = DoseEntry(
122-
type: .TempBasal,
122+
type: .tempBasal,
123123
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
124124
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
125125
value: 0.125,
126-
unit: .UnitsPerHour
126+
unit: .unitsPerHour
127127
)
128128

129129
dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
@@ -167,11 +167,11 @@ class RecommendTempBasalTests: XCTestCase {
167167
XCTAssertNil(dose)
168168

169169
let lastTempBasal = DoseEntry(
170-
type: .TempBasal,
170+
type: .tempBasal,
171171
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
172172
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
173173
value: 1.225,
174-
unit: .UnitsPerHour
174+
unit: .unitsPerHour
175175
)
176176

177177
dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
@@ -205,11 +205,11 @@ class RecommendTempBasalTests: XCTestCase {
205205

206206
// Ignore due to existing dose
207207
var lastTempBasal = DoseEntry(
208-
type: .TempBasal,
208+
type: .tempBasal,
209209
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
210210
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
211211
value: 0.125,
212-
unit: .UnitsPerHour
212+
unit: .unitsPerHour
213213
)
214214

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

226226
// Cancel existing dose
227227
lastTempBasal = DoseEntry(
228-
type: .TempBasal,
228+
type: .tempBasal,
229229
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
230230
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
231231
value: 1.225,
232-
unit: .UnitsPerHour
232+
unit: .unitsPerHour
233233
)
234234

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

247247
// Continue existing dose
248248
lastTempBasal = DoseEntry(
249-
type: .TempBasal,
249+
type: .tempBasal,
250250
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)),
251251
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)),
252252
value: 0.125,
253-
unit: .UnitsPerHour
253+
unit: .unitsPerHour
254254
)
255255

256256
dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
@@ -279,11 +279,11 @@ class RecommendTempBasalTests: XCTestCase {
279279
XCTAssertNil(dose)
280280

281281
lastTempBasal = DoseEntry(
282-
type: .TempBasal,
282+
type: .tempBasal,
283283
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -21)),
284284
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 9)),
285285
value: 0.125,
286-
unit: .UnitsPerHour
286+
unit: .unitsPerHour
287287
)
288288

289289
dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
@@ -345,11 +345,11 @@ class RecommendTempBasalTests: XCTestCase {
345345
XCTAssertNil(dose)
346346

347347
let lastTempBasal = DoseEntry(
348-
type: .TempBasal,
348+
type: .tempBasal,
349349
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
350350
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
351351
value: 1.225,
352-
unit: .UnitsPerHour
352+
unit: .unitsPerHour
353353
)
354354

355355
dose = DoseMath.recommendTempBasalFromPredictedGlucose(glucose,
@@ -528,11 +528,11 @@ class RecommendBolusTests: XCTestCase {
528528

529529
// Don't consider net-negative temp basal
530530
let lastTempBasal = DoseEntry(
531-
type: .TempBasal,
531+
type: .tempBasal,
532532
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
533533
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
534534
value: 0.01,
535-
unit: .UnitsPerHour
535+
unit: .unitsPerHour
536536
)
537537

538538
dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,
@@ -638,11 +638,11 @@ class RecommendBolusTests: XCTestCase {
638638

639639
// Less existing temp
640640
var lastTempBasal = DoseEntry(
641-
type: .TempBasal,
641+
type: .tempBasal,
642642
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -11)),
643643
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: 19)),
644644
value: 1.225,
645-
unit: .UnitsPerHour
645+
unit: .unitsPerHour
646646
)
647647

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

659659
// But not a finished temp
660660
lastTempBasal = DoseEntry(
661-
type: .TempBasal,
661+
type: .tempBasal,
662662
startDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -35)),
663663
endDate: glucose.first!.startDate.dateByAddingTimeInterval(NSTimeInterval(minutes: -5)),
664664
value: 1.225,
665-
unit: .UnitsPerHour
665+
unit: .unitsPerHour
666666
)
667667

668668
dose = DoseMath.recommendBolusFromPredictedGlucose(glucose,

0 commit comments

Comments
 (0)