Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
bade462
Bump version for dev
ps2 Jun 15, 2018
5d0a120
Merge pull request #742 from LoopKit/bump-version
ps2 Jun 15, 2018
28cd441
Update to LoopKit v2 (#736)
ps2 Jun 19, 2018
3f0e9c5
Cosmetic cleanup (#744)
Jun 19, 2018
d7e3dba
Reset recommendedBolus if we have a new prediction. (#748)
erikdi Jun 22, 2018
8825eb9
Track changing units in charts (#749)
ps2 Jun 22, 2018
96a322e
Build on the fly (#751)
ps2 Jun 25, 2018
a3d890f
Put a glucose chart on the watch.
Jun 29, 2018
0e8f0f4
Fix filename mismatches in comments
Jun 29, 2018
b0602dd
Implement PumpManager protocol (#753)
ps2 Jul 5, 2018
12c33c6
Merge branch 'dev' into dev-watch
bharat Jul 9, 2018
64f8326
Update to newer versions of LoopKit and rileylink_ios dev branches
ps2 Jul 10, 2018
6d1ee8d
Prototype of a SpriteKit-based glucose chart
Jul 19, 2018
ba08fa3
select the pickerValue based on 75% of recommendedBolus (#761)
jasoncalabrese Jul 19, 2018
f9676a4
Tweak the scene size for 42mm watches
Jul 19, 2018
1899045
Add the rest of the chart components
Jul 20, 2018
1f681c0
Set high watermark higher for mg/dl
Jul 20, 2018
fcdd4f6
Clean up pause/unpause semantics and set the max hours to 4
Jul 20, 2018
6add1ce
The crown now adjusts the height of the graph
Jul 21, 2018
09ad61c
Fix override range rendering to match the Loop app ui
Jul 21, 2018
1bb0697
Small optimizations
Jul 21, 2018
8c822b5
Clean up the rendering code to pause between data changes
Jul 21, 2018
af72a09
Remove debug code
Jul 21, 2018
5eda382
Highlight the upper BG when it changes
Jul 22, 2018
0c2bdad
Make updateGlucoseChart async to avoid hitting CPU limits
Jul 22, 2018
8ee3df8
More stability fixes & remove graph corner radius
Jul 23, 2018
1006960
Force updateNode() to run on the main queue to avoid contention
Jul 23, 2018
1f535e5
Improve watch size detection code
Jul 25, 2018
334ae6a
Switch to the more efficient SpriteNode
Jul 25, 2018
9d714e7
Only cache 4 hours of glucose history
Jul 25, 2018
deeddb2
Remove pause/unpause code- it doesn't save significant CPU
Jul 26, 2018
8a39819
Try unpausing the WKInterfaceSKScene to get the animation to stop fre…
Jul 26, 2018
abd2249
Revert "Remove pause/unpause code- it doesn't save significant CPU"
Jul 26, 2018
1c9faab
Move the IOB/COB below the graph
Jul 27, 2018
88540c8
Whitespace and comment cleanup
Jul 27, 2018
5682404
Animate moving points on the chart
Jul 28, 2018
e636fb6
Only animate the predicted path when adjusting the y-axis
Jul 28, 2018
b241a80
Clean up sprite animation code
Jul 28, 2018
7895644
Adjust scene size on 38mm watch
elnjensen Jul 29, 2018
3adc650
Only show overrides that haven't yet expired
elnjensen Jul 29, 2018
56cd2da
Fix node expiration code
Jul 30, 2018
6b5757c
Merge pull request #14 from bharat/dev-watch-sk
elnjensen Jul 30, 2018
2a067bc
Break the more complex updateSprite into two more manageable pieces: …
Jul 30, 2018
fbd6622
Clean up variable names and comments around how we expire inactive no…
Jul 31, 2018
bd6b55a
Add some comments to aid readability
Jul 31, 2018
ee4a8ba
Merge branch 'dev' into dev-watch-sk
Jul 31, 2018
dec7043
Merge remote-tracking branch 'origin/dev-watch-sk' into dev-watch-sk-ej
elnjensen Jul 31, 2018
f1da677
Change visible hours with force touch menu
elnjensen Jul 31, 2018
bc46343
Revert changes in tools versions in storyboard
elnjensen Aug 1, 2018
0a23e33
Add icons for duration menu
elnjensen Aug 1, 2018
621e7c2
Rearrange menu actions
elnjensen Aug 1, 2018
9a8c624
Fix asset locations for graph menu icons
elnjensen Aug 1, 2018
39ec79e
Merge pull request #3 from elnjensen/dev-watch-sk-ej
Aug 1, 2018
396df06
Make mmol/L graph limits be integers
elnjensen Aug 1, 2018
a1d21d9
Force minimum height for dated range rects
elnjensen Aug 1, 2018
6a6c531
Make target ranges more visible
elnjensen Aug 1, 2018
0b25d2e
Only show future part of override ranges
elnjensen Aug 1, 2018
c4800fb
Revert "Only show future part of override ranges"
elnjensen Aug 1, 2018
b6b4ec3
Expire overrides once they move into past
elnjensen Aug 2, 2018
f168e16
Set min range height via variable
elnjensen Aug 2, 2018
5db1eb5
Rearrange image assets for graph menu
elnjensen Aug 2, 2018
e1c3886
Clarify minimum height on dated range
elnjensen Aug 2, 2018
eba93b4
Merge pull request #4 from elnjensen/dev-watch-sk-ej
Aug 2, 2018
3f33e04
Don't send expired overrides in watch context
elnjensen Aug 5, 2018
028c95f
Rearrange testing of override end date
elnjensen Aug 5, 2018
5fc5129
Merge pull request #5 from elnjensen/dev-watch-sk-ej
Aug 5, 2018
17690d9
Use Int16 instead of UInt16 to handle negative numbers in predicted g…
Aug 8, 2018
604ef63
Change the appearance of the chart to be platter style to better fit …
Aug 15, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,8 @@ Pods/
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts/
Carthage/Build/tvOS/
Carthage/Build/iOS/*.bcsymbolmap
Carthage/Build/iOS/*.dSYM
Carthage/Build/watchOS/
Carthage/
.gitmodules

# fastlane
#
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: objective-c
osx_image: xcode9.3
osx_image: xcode9.4
# xcode_sdk: iphonesimulator11
# xcode_project: Loop.xcodeproj
# xcode_scheme: Loop
before_script:
# - carthage bootstrap
- set -o pipefail && xcodebuild -project Loop.xcodeproj -target Cartfile
script:
# Build the app target
- set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty
Expand Down
6 changes: 3 additions & 3 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" == 1.5.6
github "LoopKit/CGMBLEKit" == 2.1
github "LoopKit/LoopKit" "dev"
github "LoopKit/CGMBLEKit" "dev"
github "i-schuetz/SwiftCharts" == 0.6.1
github "mddub/dexcom-share-client-swift" == 0.4.1
github "mddub/G4ShareSpy" == 0.3.3
github "ps2/rileylink_ios" == 2.0.0
github "ps2/rileylink_ios" "dev"
github "LoopKit/Amplitude-iOS" "decreepify"
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
github "LoopKit/CGMBLEKit" "v2.1.0"
github "LoopKit/LoopKit" "v1.5.6"
github "i-schuetz/SwiftCharts" "6b55a26a7b0b95e49202ddc1db5404702fce114f"
github "LoopKit/CGMBLEKit" "1f9d0f221b886f12bcb2c46dc0b551589b623210"
github "LoopKit/LoopKit" "7082c64333113ad83238e483e83029c161ac35bb"
github "i-schuetz/SwiftCharts" "0.6.1"
github "mddub/G4ShareSpy" "v0.3.3"
github "mddub/dexcom-share-client-swift" "v0.4.1"
github "ps2/rileylink_ios" "v2.0.0"
github "ps2/rileylink_ios" "4a714a59d399aeb2984cbbe0434f02e6b59cfec5"
18 changes: 0 additions & 18 deletions Carthage/Build/.Amplitude-iOS.version

This file was deleted.

21 changes: 0 additions & 21 deletions Carthage/Build/.CGMBLEKit.version

This file was deleted.

18 changes: 0 additions & 18 deletions Carthage/Build/.G4ShareSpy.version

This file was deleted.

30 changes: 0 additions & 30 deletions Carthage/Build/.LoopKit.version

This file was deleted.

21 changes: 0 additions & 21 deletions Carthage/Build/.SwiftCharts.version

This file was deleted.

18 changes: 0 additions & 18 deletions Carthage/Build/.dexcom-share-client-swift.version

This file was deleted.

41 changes: 0 additions & 41 deletions Carthage/Build/.rileylink_ios.version

This file was deleted.

18 changes: 0 additions & 18 deletions Carthage/Build/.xDripG5.version

This file was deleted.

Binary file removed Carthage/Build/iOS/Amplitude.framework/Amplitude
Binary file not shown.
68 changes: 0 additions & 68 deletions Carthage/Build/iOS/Amplitude.framework/Headers/AMPARCMacros.h

This file was deleted.

37 changes: 0 additions & 37 deletions Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h

This file was deleted.

40 changes: 0 additions & 40 deletions Carthage/Build/iOS/Amplitude.framework/Headers/AMPDatabaseHelper.h

This file was deleted.

Loading