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.

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

Automatic bolus dosing #1219

Closed
wants to merge 48 commits into from
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
cd75b80
Initial automatic bolus dosing implementation
ps2 Dec 27, 2019
8b41d07
Adding user configuration
ps2 Dec 28, 2019
091bc29
Compute max automatic bolus as partial application of max bolus
ps2 Dec 28, 2019
f349135
maxBolus fix
ps2 Dec 28, 2019
de01638
Set temp basals for in-range when override active
ps2 Dec 28, 2019
8832514
Add dosing tests for automatic bolusing
ps2 Dec 28, 2019
1d43ab2
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Dec 31, 2019
e5dbed1
Fix display of dose recommendation
ps2 Dec 31, 2019
b99179b
Add feature specifier and bundle identifier to issue report
ps2 Dec 31, 2019
b132143
Simplify automatic bolus logic, and handle positive overrides correctly
ps2 Jan 1, 2020
d98ce89
Use current bg as start of forecast
ps2 Jan 8, 2020
69956cd
Bump version and set feature specifier
ps2 Jan 8, 2020
445be48
Do not automatically attempt dose during suspend, and round to neares…
ps2 Jan 18, 2020
56df126
Fix rounding for 0 doses.
ps2 Jan 18, 2020
0b477bc
Merge latest dev
ps2 Jan 19, 2020
b8ae394
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Jan 22, 2020
d0272ec
Bump carthage revs
ps2 Jan 27, 2020
a4f91a2
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Jan 28, 2020
5bd29a8
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Feb 1, 2020
7796cf8
Update tests for updated rounding
ps2 Feb 1, 2020
cf8e391
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Feb 7, 2020
6a7de8e
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Feb 29, 2020
61a8388
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Mar 22, 2020
586b03e
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Apr 1, 2020
8f65a55
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Apr 1, 2020
081d52f
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Apr 1, 2020
002bb12
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Apr 4, 2020
7a3abb0
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Apr 18, 2020
f1b6714
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 May 6, 2020
37be6d7
Bump carthage revision
ps2 May 9, 2020
7f7ea53
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 May 11, 2020
84a9d84
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 May 18, 2020
f875d18
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 May 18, 2020
5fa561e
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 May 20, 2020
7092538
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Jul 26, 2020
476d20e
Carthage fixes for building with Xcode12
ps2 Sep 17, 2020
aff9ac7
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Sep 25, 2020
0307c1a
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Sep 26, 2020
f1f4c03
Merge remote-tracking branch 'refs/remotes/origin/automatic-bolus' in…
ps2 Sep 26, 2020
e405aa5
Merge remote-tracking branch 'origin/dev' into automatic-bolus
ps2 Oct 4, 2020
dc35b5b
Merge pull request #1397 from LoopKit/dev
ps2 Oct 4, 2020
ec7e952
Updates for carthage build with Xcode 12.1
ps2 Oct 23, 2020
f18ea58
Updates for carthage build with Xcode 12.1
ps2 Oct 23, 2020
18af414
Update travis to use xcode12
ps2 Oct 23, 2020
d3b89da
Use embedded carthage binary
Jan 19, 2021
8a1bdb8
Merge branch 'carthage-bin' into automatic-bolus
Jan 19, 2021
26b11d7
Update rileylink_ios to use pinned carthage
ps2 Jan 20, 2021
0e51062
Merge branch 'carthage-bin' into automatic-bolus
ps2 Jan 20, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion Common/Extensions/NSBundle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ extension Bundle {
var bundleDisplayName: String {
return object(forInfoDictionaryKey: "CFBundleDisplayName") as! String
}

var featureSpecifier: String? {
return object(forInfoDictionaryKey: "com.loopkit.Loop.featureSpecifier") as? String
}

var localizedNameAndVersion: String {
return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, shortVersionString)
var displayName = bundleDisplayName
if let featureSpecifier = featureSpecifier {
displayName += " (\(featureSpecifier))"
}
return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), displayName, shortVersionString)
}

private var mainAppBundleIdentifier: String? {
Expand Down