Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a7053e0
Have travis build the app
loudnate May 24, 2016
64a8f97
mvers 0.1.0
loudnate May 24, 2016
f95e33e
Read reservoir volume before bolusing
loudnate May 27, 2016
8bbef17
Fixing travis
loudnate May 27, 2016
40bff05
Updating RL branch
loudnate May 27, 2016
cafc149
Updating RL branch
loudnate May 27, 2016
d416c6d
Comments and refactoring.
loudnate May 27, 2016
ad522c9
Merge pull request #2 from loudnate/read-reservoir
loudnate May 27, 2016
fa05fa5
Merge branch 'master' into refactor
loudnate May 27, 2016
3caa51e
RemoteSettings.plist and Carthage instructions.
loudnate May 27, 2016
3c4d2b1
Merge pull request #3 from loudnate/refactor
loudnate May 27, 2016
f88cbbe
mvers 0.2.0
loudnate May 27, 2016
dd81f36
Merge pull request #4 from loudnate/mvers
loudnate May 28, 2016
c50d010
Adding reservoir polling when sentry listening is disabled.
loudnate May 28, 2016
6ad9575
Toggling sentry listening based on the PumpModel
loudnate May 28, 2016
d53c318
Create tags in "v0.0.0" format
loudnate May 28, 2016
72192a7
Merge pull request #5 from loudnate/poll-reservoir
loudnate May 28, 2016
25050fb
Merge pull request #6 from loudnate/update-tagging-script
loudnate May 28, 2016
338f7cf
Fixing pumpState observation
loudnate May 28, 2016
760f7a1
Merge pull request #7 from loudnate/pumpstate-observing
loudnate May 28, 2016
ca9d47c
More README updates
loudnate May 29, 2016
111bf30
Merge pull request #8 from loudnate/loop-dev
loudnate May 29, 2016
437a0e4
Screenshots
loudnate May 29, 2016
90bbe85
Merge branch 'dev' of github.com:loudnate/Loop into loop-dev
loudnate May 29, 2016
78f97a2
Adding screenshots to the README
loudnate May 29, 2016
f613f02
Updating RL branch
loudnate May 29, 2016
8e42219
Merge branch 'master' into loop-dev
loudnate May 29, 2016
93b6952
Updating SwiftCharts
loudnate May 29, 2016
acd5fd6
Merge branch 'master' into loop-dev
loudnate May 29, 2016
2bca763
Short-erm fix for the README images
loudnate May 29, 2016
e3be44c
Remove repeat uses of "Technically Optional"
loudnate May 29, 2016
ed5dbc5
Update README.md
loudnate May 29, 2016
53945e0
Remove unsupported image target attribute
loudnate May 29, 2016
ca54031
Automatically enable/disable the timer tick based on whether there is…
loudnate May 29, 2016
4a8f9da
Update README.md to point to Loop.
loudnate May 29, 2016
4cc529c
Merge pull request #12 from loudnate/auto-timer-tick
loudnate May 29, 2016
2a3f4d5
Updating to RLiOS dev
loudnate Jun 3, 2016
d8b0096
Fix template filepath
channemann Jun 3, 2016
d381f6f
Merge pull request #14 from channemann/dev
loudnate Jun 4, 2016
8b14b72
Updating dependencies
loudnate Jun 4, 2016
1f2a07b
Merge naterade-ios into dev
loudnate Jun 4, 2016
904475e
Pointing README images to master
loudnate Jun 4, 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
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3
github "loudnate/xDripG5" ~> 0.4
github "loudnate/SwiftCharts" "loudnate/naterade"
github "mddub/dexcom-share-client-swift" ~> 0.1
github "ps2/rileylink_ios" ~> 0.3
github "ps2/rileylink_ios" ~> 0.3.2
github "mpurland/Amplitude-iOS" "framework"
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "mpurland/Amplitude-iOS" "934536d24cb9ce5c567c74ff12e2955faed74bc3"
github "loudnate/Crypto" "e0ef5b498f2c373d676135dabf5d1803b8558509"
github "loudnate/LoopKit" "v0.3.2"
github "loudnate/SwiftCharts" "448b80f4025bbf592a4d8ca9d079e9684bc0b64b"
github "mddub/dexcom-share-client-swift" "v0.1.0"
github "ps2/rileylink_ios" "v0.3.0"
github "loudnate/SwiftCharts" "dc8f5fbb29e391a65995d138158139559e365a1e"
github "mddub/dexcom-share-client-swift" "v0.1.1"
github "ps2/rileylink_ios" "v0.3.2"
github "loudnate/xDripG5" "0.4.1"
Binary file added Documentation/Changing the app icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Phone Bolus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Phone Graphs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Watch Bolus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Watch Carb Entry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Watch Complication.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "#!/bin/bash&#10;&#10;if [[ ! -d $SRCROOT ]]; then&#10;echo &quot;This script must be run from an Xcode Build Phase&quot;&#10;exit 1;&#10;fi&#10;&#10;# Globals&#10;Tag=&#10;Logfile=&#10;CFBundleVersion=&#10;CFBundleShortVersionString=&#10;&#10;function init_logging () {&#10; logdir=&quot;$HOME/Library/Logs/$PRODUCT_BUNDLE_IDENTIFIER&quot;&#10; mkdir -p $logdir&#10; Logfile=&quot;$logdir/archive_post_actions.log&quot;&#10; exec &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10; echo &quot;\n\n\n$(date) Beginning archive post-actions for $CONFIGURATION&quot;&#10;}&#10;&#10;function increment_bundle_version () {&#10; srcPlist=&quot;$1&quot;&#10; PlistBuddy=&quot;/usr/libexec/PlistBuddy&quot;&#10;&#10; CFBundleVersion=`$PlistBuddy -c &quot;Print CFBundleVersion&quot; $srcPlist`&#10; CFBundleShortVersionString=`$PlistBuddy -c &quot;Print CFBundleShortVersionString&quot; $srcPlist`&#10; Tag=&quot;$PRODUCT_NAME$PRODUCT_NAME_SUFFIX-$CFBundleShortVersionString-$CFBundleVersion&quot;&#10;&#10; # Increment the bundle version for future builds&#10; CFBundleVersionNext=$(($CFBundleVersion + 1))&#10; $PlistBuddy -c &quot;Set :CFBundleVersion $CFBundleVersionNext&quot; $srcPlist&#10;&#10; echo &quot;Updated build number of $srcPlist to $CFBundleVersionNext&quot;&#10;&#10; # Copy the new version to the settings bundle&#10; # settingsPlist=&quot;$SRCROOT/$PRODUCT_NAME/Settings.bundle/Root.plist&quot;&#10; # $PlistBuddy -c &quot;Set :PreferenceSpecifiers:0:DefaultValue $CFBundleShortVersionString ($CFBundleVersionNext)&quot; $settingsPlist&#10;&#10; git add $srcPlist &gt;&gt; $Logfile 2&gt;&amp;1&#10;}&#10;&#10;function commit_and_tag_changes () {&#10; cd &quot;$SRCROOT&quot;&#10;&#10; git commit -m &quot;Auto-commit with archive $Tag&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10; git tag $Tag &gt;&gt; $Logfile 2&gt;&amp;1&#10; git push &gt;&gt; $Logfile 2&gt;&amp;1&#10; git push --tags &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10; cd -&#10;}&#10;&#10;function merge_to_master () {&#10; cd &quot;$SRCROOT&quot;&#10;&#10; branch=$(git symbolic-ref --short HEAD)&#10;&#10; git checkout master &gt;&gt; $Logfile 2&gt;&amp;1&#10; git merge &quot;$branch&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10; git push &gt;&gt; $Logfile 2&gt;&amp;1&#10; git checkout &quot;$branch&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10; cd -&#10;}&#10;&#10;## Run&#10;&#10;init_logging&#10;increment_bundle_version &quot;$SRCROOT/$INFOPLIST_FILE&quot;&#10;increment_bundle_version &quot;$SRCROOT/WatchApp/Info.plist&quot;&#10;commit_and_tag_changes&#10;">
scriptText = "#!/bin/bash&#10;&#10;if [[ ! -d $SRCROOT ]]; then&#10;echo &quot;This script must be run from an Xcode Build Phase&quot;&#10;exit 1;&#10;fi&#10;&#10;# Globals&#10;Tag=&#10;Logfile=&#10;CFBundleVersion=&#10;CFBundleShortVersionString=&#10;&#10;function init_logging () {&#10; logdir=&quot;$HOME/Library/Logs/$PRODUCT_BUNDLE_IDENTIFIER&quot;&#10; mkdir -p $logdir&#10; Logfile=&quot;$logdir/archive_post_actions.log&quot;&#10; exec &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10; echo &quot;\n\n\n$(date) Beginning archive post-actions for $CONFIGURATION&quot;&#10;}&#10;&#10;function increment_bundle_version () {&#10; srcPlist=&quot;$1&quot;&#10; PlistBuddy=&quot;/usr/libexec/PlistBuddy&quot;&#10;&#10; CFBundleVersion=`$PlistBuddy -c &quot;Print CFBundleVersion&quot; $srcPlist`&#10; CFBundleShortVersionString=`$PlistBuddy -c &quot;Print CFBundleShortVersionString&quot; $srcPlist`&#10; Tag=&quot;v$CFBundleShortVersionString&quot;&#10;&#10; # Increment the bundle version for future builds&#10; CFBundleVersionNext=$(($CFBundleVersion + 1))&#10; $PlistBuddy -c &quot;Set :CFBundleVersion $CFBundleVersionNext&quot; $srcPlist&#10;&#10; echo &quot;Updated build number of $srcPlist to $CFBundleVersionNext&quot;&#10;&#10; # Copy the new version to the settings bundle&#10; # settingsPlist=&quot;$SRCROOT/$PRODUCT_NAME/Settings.bundle/Root.plist&quot;&#10; # $PlistBuddy -c &quot;Set :PreferenceSpecifiers:0:DefaultValue $CFBundleShortVersionString ($CFBundleVersionNext)&quot; $settingsPlist&#10;&#10; git add $srcPlist &gt;&gt; $Logfile 2&gt;&amp;1&#10;}&#10;&#10;function commit_and_tag_changes () {&#10; cd &quot;$SRCROOT&quot;&#10;&#10; git commit -m &quot;Auto-commit with archive $Tag&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10; git tag $Tag &gt;&gt; $Logfile 2&gt;&amp;1&#10; git push &gt;&gt; $Logfile 2&gt;&amp;1&#10; git push --tags &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10; cd -&#10;}&#10;&#10;function merge_to_master () {&#10; cd &quot;$SRCROOT&quot;&#10;&#10; branch=$(git symbolic-ref --short HEAD)&#10;&#10; git checkout master &gt;&gt; $Logfile 2&gt;&amp;1&#10; git merge &quot;$branch&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10; git push &gt;&gt; $Logfile 2&gt;&amp;1&#10; git checkout &quot;$branch&quot; &gt;&gt; $Logfile 2&gt;&amp;1&#10;&#10; cd -&#10;}&#10;&#10;## Run&#10;&#10;init_logging&#10;increment_bundle_version &quot;$SRCROOT/$INFOPLIST_FILE&quot;&#10;increment_bundle_version &quot;$SRCROOT/WatchApp/Info.plist&quot;&#10;commit_and_tag_changes&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
Expand Down
2 changes: 1 addition & 1 deletion Loop/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.0</string>
<string>0.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Loading