Skip to content
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

Incorporate sleep data into complication user info transfer calculations #1217

Merged
merged 23 commits into from
Feb 4, 2020
Merged

Incorporate sleep data into complication user info transfer calculations #1217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
774a272
Resolve conflicts
novalegra Dec 22, 2019
6849b3c
Actually resolve them :-)
novalegra Dec 22, 2019
ab440e9
Add what I have
novalegra Dec 23, 2019
c1512d4
Add sleep permission
novalegra Dec 25, 2019
ee2227a
Refine complication math
novalegra Dec 25, 2019
0658c47
Improvements to complication-refresh code
novalegra Dec 27, 2019
f68e6ef
Merge remote-tracking branch 'upstream/dev' into update-complications
novalegra Dec 27, 2019
e503af4
Update to match dev
novalegra Dec 27, 2019
2e742d7
Make cartfile accurate
novalegra Dec 27, 2019
53c98a8
Add newline
novalegra Dec 27, 2019
a65f586
TimeInterval -> Date
novalegra Dec 28, 2019
cc17049
Ensure last update time is updated in case of failure
novalegra Dec 28, 2019
28795e5
Remove print statement
novalegra Dec 29, 2019
ec14d2e
Changes based on review
novalegra Dec 30, 2019
e70a89e
More changes in response to review
novalegra Dec 31, 2019
fbaa204
Merge branch 'aq/update-complications' of https://github.com/novalegr…
ps2 Jan 26, 2020
f83217a
Avoid crash on HKSampleQuery error
ps2 Jan 26, 2020
20bc003
Fix crash due to incorrect error type
novalegra Jan 26, 2020
f71c485
Merge remote-tracking branch 'origin/aq/update-complications' into up…
novalegra Jan 26, 2020
aeb14be
Fix for authorization error
novalegra Jan 27, 2020
ffbaea9
Remove delay to mirror LoopKit
novalegra Jan 28, 2020
975c296
Merge remote-tracking branch 'upstream/dev' into update-complications
novalegra Jan 28, 2020
cc0d636
Update ExponentialInsulinModelPreset.swift
novalegra Jan 28, 2020
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
Prev Previous commit
Next Next commit
Actually resolve them :-)
  • Loading branch information
@novalegra
novalegra committed Dec 22, 2019
commit 6849b3cd0878530aa04229990e6bc838b271052c
10 changes: 0 additions & 10 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
<<<<<<< HEAD
github "LoopKit/LoopKit" "dev"
github "LoopKit/CGMBLEKit" "dev"
github "i-schuetz/SwiftCharts" == 0.6.5
github "LoopKit/dexcom-share-client-swift" "dev"
github "LoopKit/G4ShareSpy" "dev"
github "ps2/rileylink_ios" "dev"
=======

github "LoopKit/LoopKit" ~> 2.2
github "LoopKit/CGMBLEKit" ~> 3.1
github "ps2/SwiftCharts" "hotfix-xcode10.2"
github "LoopKit/dexcom-share-client-swift" == 1.0
github "LoopKit/G4ShareSpy" == 1.0
github "ps2/rileylink_ios" ~> 2.1
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
github "LoopKit/Amplitude-iOS" "decreepify"
10 changes: 0 additions & 10 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
<<<<<<< HEAD
github "LoopKit/CGMBLEKit" "fe92d93c24d18ff9755ff027e9b036d3769a8a0a"
github "LoopKit/G4ShareSpy" "f6ae0cf1753131135f26046ddf07e096da884b84"
github "LoopKit/LoopKit" "b47d60e6ed202ca30e4adc63c6d237ac100e72b4"
github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
github "LoopKit/dexcom-share-client-swift" "cdbb1cd19cf54b37add6d6c25300445a6abe24da"
github "i-schuetz/SwiftCharts" "0.6.5"
github "ps2/rileylink_ios" "43789bd2d25e8ce32a0ccae31a4b85f419eb8aa9"
=======
github "LoopKit/CGMBLEKit" "v3.1"
github "LoopKit/G4ShareSpy" "v1.0"
github "LoopKit/LoopKit" "v2.2.2"
github "LoopKit/dexcom-share-client-swift" "v1.0"
github "ps2/SwiftCharts" "cc8c401171d5ccb638ec6c87f6c410ee31fa774d"
github "ps2/rileylink_ios" "v2.1.1"
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
4 changes: 0 additions & 4 deletions DoseMathTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>1.10.1</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 0 additions & 4 deletions Loop Status Extension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>$(LOOP_MARKETING_VERSION)</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>MainAppBundleIdentifier</key>
Expand Down
4 changes: 0 additions & 4 deletions Loop/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>$(LOOP_MARKETING_VERSION)</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
4 changes: 0 additions & 4 deletions LoopTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>1.10.1</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 0 additions & 4 deletions LoopUI/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>$(LOOP_MARKETING_VERSION)</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 0 additions & 4 deletions WatchApp Extension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>$(LOOP_MARKETING_VERSION)</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 0 additions & 4 deletions WatchApp/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>$(LOOP_MARKETING_VERSION)</string>
=======
<string>1.9.6</string>
>>>>>>> 5df0b4c1110b99947461e6b5047930b18582128d
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down