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

Release 2.2 #1305

Merged
merged 50 commits into from
Apr 18, 2020
Merged

Release 2.2 #1305

Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8eae264
Bump Loop version to 2.1 for dev
ps2 Jan 8, 2020
71b4f41
Increase history interval for carb cache
ps2 Jan 12, 2020
0a19eff
Include current bg when considering suspend threshold and dosing thre…
ps2 Jan 12, 2020
012aa23
Include insulin model delay in computation of dose
dm61 Jan 14, 2020
c45caaa
Fix dose math tests
dm61 Jan 14, 2020
169b429
Merge pull request #1234 from LoopKit/carb-cache-length
ps2 Jan 16, 2020
b944488
Merge pull request #1235 from LoopKit/current-bg-dosing-thresholds
ps2 Jan 16, 2020
40ae183
add delay to insulin model presets
dm61 Jan 18, 2020
824fe6a
Merge pull request #1242 from dm61/insulin-model-delay
ps2 Jan 19, 2020
08a6f35
Bump carthage revs
ps2 Jan 19, 2020
a1fc115
Unify carb entry + bolus flow
mpangburn Dec 28, 2019
50562ca
Alert on bolus recommendation change
mpangburn Dec 29, 2019
ca8d2fa
Recompute RC when considering past carb entry
mpangburn Jan 8, 2020
4e6eef5
Update comments re carb entry chart
mpangburn Jan 8, 2020
25f87d1
Visual updates per review
mpangburn Jan 15, 2020
3a608dc
Include pending insulin in prediction charts
mpangburn Jan 16, 2020
df69421
Don't predict glucose with stale data
mpangburn Jan 18, 2020
824f90a
Updates for merge with dev.
ps2 Jan 20, 2020
f5aaf1e
Update Loop to compile with LoopKit carb effects update
ps2 Jan 21, 2020
1fab955
Bump LoopKit cartfile rev
ps2 Jan 21, 2020
c21180d
Bolus recommendations include pending insulin
mpangburn Jan 21, 2020
9faec59
Updates from review
mpangburn Jan 23, 2020
7964109
Bump carthage revisions
ps2 Jan 26, 2020
9728519
Merge dev
ps2 Jan 26, 2020
49977fc
Fix log style
ps2 Jan 26, 2020
044781f
Merge pull request #1244 from LoopKit/carb-entry-flow
ps2 Jan 27, 2020
ebd939a
Fix interval multiple for dose chart y axis (#1245)
ps2 Jan 27, 2020
ffd40d7
Include pending insulin in watch prediction (#47)
mpangburn Jan 31, 2020
78f4bea
Visual tweaks from DIY
mpangburn Jan 29, 2020
b6c1573
Align continue button text
mpangburn Jan 29, 2020
05af23d
Incorporate sleep data into complication user info transfer calculati…
novalegra Feb 4, 2020
b278507
Fix incorrect carb effect in bolus prediction
mpangburn Feb 7, 2020
ed7bf7f
fix nightscout trend arrows (#1274)
dabear Feb 25, 2020
9da678d
Denote stale glucose as three dashes (#1275)
ps2 Feb 29, 2020
149216c
Support enacting manual loop if loop error (#1252)
mpangburn Feb 29, 2020
a1e9ef6
Chore: Updated Swedish (sv) translations. (#1280)
hummelstrand Mar 22, 2020
e5d788a
Update cartfile revs
ps2 Mar 22, 2020
55766fa
Persistent device logs (#1289)
ps2 Apr 1, 2020
b18f0c1
Put device logs database files in separate directory
ps2 Apr 1, 2020
298a9cc
Bump carthage revs
ps2 Apr 1, 2020
eb0277d
Add warning when user attempts to edit basal schedule without a confi…
novalegra Apr 1, 2020
0d66a8a
Finnish translations update (#1291)
mylma Apr 1, 2020
13b35e2
Update HealthKit usage description (#1294)
novalegra Apr 3, 2020
ac77834
Bump carthage revs
ps2 Apr 4, 2020
445ae98
FI: Add a missing Carb Entry translation (#1303)
mylma Apr 18, 2020
3d42779
Dispatch dosestore completions back to main (#1302)
ps2 Apr 18, 2020
d14a282
Bump carthage revs
ps2 Apr 18, 2020
8850217
Merge branch 'master' into dev
ps2 Apr 18, 2020
2388969
Bump version for release
ps2 Apr 18, 2020
c6c0839
Reset DEVELOPMENT_TEAM
ps2 Apr 18, 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
Update comments re carb entry chart
  • Loading branch information
@mpangburn @ps2
mpangburn authored and ps2 committed Jan 19, 2020
commit 4e6eef5bb3b12ef0f193777a5a015acb7f4df649
4 changes: 2 additions & 2 deletions Loop/View Controllers/CarbEntryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ final class CarbEntryViewController: ChartsTableViewController, IdentifiableClas
private var lastContentHeight: CGFloat = 0

override func createChartsManager() -> ChartsManager {
// TODO: implement chart in this controller
// Consider including a chart on this screen to demonstrate how absorption time affects prediction
ChartsManager(colors: .default, settings: .default, charts: [], traitCollection: traitCollection)
}

override func glucoseUnitDidChange() {
// TODO: implement chart in this controller
// Consider including a chart on this screen to demonstrate how absorption time affects prediction
}

override func viewDidLoad() {
Expand Down