Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
2a80ed4
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Oct 9, 2017
7658972
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Nov 3, 2017
47ad706
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Nov 4, 2017
f573283
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Nov 18, 2017
a87fdc0
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Dec 5, 2017
3d9f17b
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Dec 5, 2017
155e0a1
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Dec 16, 2017
9335bc3
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Dec 20, 2017
b618eb3
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Dec 22, 2017
d6e04fc
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Jan 13, 2018
13f5bfa
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Feb 18, 2018
ae9768d
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Mar 13, 2018
da7b61d
integral retrospective correction
dm61 Mar 21, 2018
200e8f1
update identifier
dm61 Mar 21, 2018
85326ab
integral retrospective correction, safer velocity calculation
dm61 Mar 26, 2018
6be017f
Merge pull request #1 from dm61/integral-retrospective-correction
dm61 Mar 26, 2018
cbd8a32
integral retrospective correct, reset if glucose data missing
dm61 Mar 27, 2018
d183699
Merge pull request #2 from dm61/integral-retrospective-correction
dm61 Mar 27, 2018
1a0fc78
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Apr 7, 2018
09b67fe
Merge remote-tracking branch 'LoopKit/dev' into integral-retrospectiv…
dm61 Apr 10, 2018
10313f2
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Apr 16, 2018
35e34f2
Merge remote-tracking branch 'LoopKit/dev' into integral-retrospectiv…
dm61 Apr 16, 2018
07e9e18
Merge branch 'LoopKit/dev' into dev
dm61 May 5, 2018
38c744d
Merge branch 'LoopKit/dev' into integral-retrospective-correction
dm61 May 5, 2018
ce354f6
Merge branch 'LoopKit/dev' into integral-retrospective-correction
dm61 May 5, 2018
aabc1f3
Merge branch 'LoopKit/dev' into dev
dm61 May 5, 2018
7a4403e
Merge branch 'integral-retrospective-correction' into try-integral-re…
dm61 May 5, 2018
5f2b5a1
allow high temps below correction range
dm61 May 6, 2018
9a040e7
allow bolus recommendation below suspend threshold
dm61 May 6, 2018
34ebb47
Merge branch 'allow-hightemp-below-cr' into my-customized-Loop
dm61 May 6, 2018
86b60c9
Merge branch 'bolus-threshold-below-suspend' into my-customized-Loop
dm61 May 6, 2018
dfce5d5
always set temp basal from Loop instead of canceling
dm61 May 6, 2018
2d6e7d4
custom default absorption time and peak insulin activity
dm61 May 6, 2018
3d09f89
Merge branch 'always-Loop-basal' into my-customized-Loop
dm61 May 6, 2018
c1bff8f
Merge branch 'my-customized-parameters' into my-customized-Loop
dm61 May 6, 2018
c4b17c6
Merge remote-tracking branch 'LoopKit/dev' into integral-retrospectiv…
dm61 May 10, 2018
0a70fdb
update integral RC only after glucose update
dm61 May 10, 2018
e9f6098
Merge branch 'integral-retrospective-correction' into my-customized-Loop
dm61 May 10, 2018
f52b0f0
display retrospective correction effect
dm61 May 12, 2018
993ad8c
integral RC indicator
dm61 May 12, 2018
e9150f1
-
dm61 May 13, 2018
46ea449
Retrospective correction indicator
dm61 May 13, 2018
80b9332
Retrospective correction indicator
dm61 May 13, 2018
ccec42f
Merge branch 'integral-retrospective-correction-indicator' into integ…
dm61 May 13, 2018
9139e1f
Merge branch 'integral-retrospective-correction' into my-customized-Loop
dm61 May 13, 2018
1a20625
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 May 13, 2018
42e2e16
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Jun 15, 2018
ec480c0
Merge remote-tracking branch 'LoopKit/dev' into integral-retrospectiv…
dm61 Jun 15, 2018
63c87d9
Merge remote-tracking branch 'LoopKit/dev' into my-customized-Loop
dm61 Jun 15, 2018
bade462
Bump version for dev
ps2 Jun 15, 2018
5d0a120
Merge pull request #742 from LoopKit/bump-version
ps2 Jun 15, 2018
2702fc7
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Jun 15, 2018
92c43d5
Merge remote-tracking branch 'LoopKit/dev' into integral-retrospectiv…
dm61 Jun 15, 2018
a9f4115
Reinitialize integral RC states after Loop restart
dm61 Jun 17, 2018
67b08f5
RC disabled vs inactive messages
dm61 Jun 18, 2018
03afa0d
Merge pull request #4 from dm61/integral-retrospective-correction-res…
dm61 Jun 18, 2018
28cd441
Update to LoopKit v2 (#736)
ps2 Jun 19, 2018
3f0e9c5
Cosmetic cleanup (#744)
Jun 19, 2018
a90f70b
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Jun 19, 2018
99822f6
Merge remote-tracking branch 'LoopKit/dev' into integral-retrospectiv…
dm61 Jun 20, 2018
a91d2a3
update IRC to LoopKit v2
dm61 Jun 20, 2018
b4428ae
Merge pull request #5 from dm61/integral-retrospective-correction-Loo…
dm61 Jun 21, 2018
d9714b7
Merge branch 'integral-retrospective-correction' into my-customized-Loop
dm61 Jun 21, 2018
69beb98
fix id and HKUnit
dm61 Jun 21, 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
561257d
more robust once-per-bg irc update
dm61 Jun 23, 2018
96a322e
Build on the fly (#751)
ps2 Jun 25, 2018
b0602dd
Implement PumpManager protocol (#753)
ps2 Jul 5, 2018
64f8326
Update to newer versions of LoopKit and rileylink_ios dev branches
ps2 Jul 10, 2018
5bed039
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Jul 18, 2018
ba08fa3
select the pickerValue based on 75% of recommendedBolus (#761)
jasoncalabrese Jul 19, 2018
040e7a4
Merge remote-tracking branch 'LoopKit/dev' into dev
dm61 Jul 19, 2018
4dfe8f5
Merge branch 'dev' into my-customized-Loop
dm61 Jul 19, 2018
bb8b187
fix conflicts
dm61 Jul 19, 2018
1b0b757
point to rileylink_ios with setup fix
dm61 Jul 23, 2018
ebb6f75
Carthage update
dm61 Jul 23, 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 "dm61/rileylink_ios" "x23-setup-fix"
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" "c1e3a33a08862ef79b1d4e39ab0b42388cb797c6"
github "dm61/rileylink_ios" "46864678b9f9d668c0896ee3c7ffb795ad7e2d25"
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"
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