Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
8380bc1
Added BatteryChemistry Selection
jlucasvt Nov 15, 2016
21c9768
Added Battery Calculation
jlucasvt Nov 15, 2016
5b60c34
Descriptions and Syntax Corrections #141
jlucasvt Nov 15, 2016
23ca6f9
Update NightscoutService.swift
hilarykoch Nov 17, 2016
60c57ab
Merge pull request #263 from hilarykoch/patch-1
ps2 Nov 18, 2016
eb9481d
Merge pull request #272 from LoopKit/master
ps2 Nov 22, 2016
652fec9
Adding italian translations
ps2 Nov 22, 2016
1e2bf57
Merge branch 'dev-1.1.1-x22BatteryStatus' of https://github.com/jluca…
ps2 Nov 22, 2016
969da0c
dynamically compute battery percent, observe both types of battery up…
ps2 Nov 22, 2016
9bffe97
Use 0-1 range instead of percent for battery level, remove unused code
ps2 Nov 22, 2016
ca8f483
Fix battery monitoring to use 0-1 range
ps2 Nov 22, 2016
22640cf
Update wording and timespan for lithium description.
ps2 Nov 22, 2016
3e33c1f
Use BatteryChemistryType from MinimedKit
ps2 Nov 24, 2016
884831a
Merge pull request #275 from LoopKit/x22-battery-pct
ps2 Nov 24, 2016
fe667c7
Remove unused translation files, and avoid translating CFBundleName
ps2 Nov 24, 2016
ca54f3e
Merge pull request #274 from LoopKit/translation-it
ps2 Nov 24, 2016
678734b
Move GlucoseTrend model from WatchApp Extension into Loop.
Nov 27, 2016
4bc2636
Merge pull request #1 from LoopKit/dev
Dec 1, 2016
5710778
Clicking Recommended copies values down! Closes #286
shanselman Dec 1, 2016
c85759a
Update rl frameworks to 0.12.9 to get alkaline battery chemistry changes
ps2 Dec 1, 2016
8cccdb0
Merge pull request #282 from bharat/issue_280
ps2 Dec 1, 2016
689b0f6
Merge pull request #290 from LoopKit/update-rl-frameworks-for-battery
ps2 Dec 1, 2016
cc098c4
Reverting UI change to Bolus Wizard
shanselman Dec 1, 2016
89dd06b
Merge remote-tracking branch 'upstream/dev' into dev
Dec 1, 2016
2032250
VoiceOver/Accessibilty for Recommended Bolus ProUser trick
shanselman Dec 1, 2016
40ac411
Turn on "Missing Localizability" - XCode suggested fix.
Dec 2, 2016
a7ed6bf
Merge pull request #296 from bharat/issue_295
ps2 Dec 2, 2016
7f2d857
Merge pull request #288 from shanselman/RecommendedBolusPR
ps2 Dec 2, 2016
4c5e32c
Remove default value for allowPredictiveTempBelowRange (#297)
Dec 2, 2016
25ab3e8
Update osx_image to xcode8.1 to get Swift 3.0.1
Dec 2, 2016
370bea1
Merge pull request #302 from bharat/issue_301
ps2 Dec 4, 2016
d3542e1
Bump version
ps2 Dec 9, 2016
d4bdf59
If minBG is below 55, then shut off basal, even if eventualBG is in r…
ps2 Dec 9, 2016
8e62c42
Create a lock screen widget (aka Today Extension) (#281)
Dec 10, 2016
282ac69
Merge pull request #310 from LoopKit/hard-cutoff-for-low-bg
ps2 Dec 10, 2016
d8ce03f
Merge pull request #309 from LoopKit/bump-version
ps2 Dec 10, 2016
55576cf
Update bundle identifier to com.loopkit
ps2 Dec 11, 2016
9808a28
adding CustomDebugStringConvertible support for the new manager/state…
ps2 Dec 11, 2016
042ed70
Merge pull request #313 from LoopKit/update-bundle-identifier
ps2 Dec 11, 2016
e0af02f
Fix the sourceTree for the Loop Status Extension storyboard.
Dec 11, 2016
5838f6d
Properly support mmol/L in the status extension.
Dec 11, 2016
bde902e
Reverse two logical checks for clarity.
Dec 12, 2016
50214d4
Merge pull request #316 from bharat/issue_311
ps2 Dec 12, 2016
c4cd1dd
Merge pull request #314 from LoopKit/custom-debugstring-for-status-ex…
ps2 Dec 12, 2016
b897bef
Merge pull request #315 from bharat/fix-xcode-proj
ps2 Dec 12, 2016
3027fda
Change how app group id is constructed to avoid conflict with acciden…
ps2 Dec 12, 2016
73b7302
Merge pull request #318 from LoopKit/fix-nates-build
ps2 Dec 24, 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
Prev Previous commit
Next Next commit
Descriptions and Syntax Corrections #141
- Updated Switch Descriptions and Alkaline syntax
  • Loading branch information
jlucasvt committed Nov 15, 2016
commit 5b60c34ee1f74ce64a86c8c7e3c85ea27e26e41e
8 changes: 4 additions & 4 deletions Loop/Managers/DeviceDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
}
}

/// NonMySentry Battery Calculation for Alkline and Lithuim #141
/// NonMySentry Battery Calculation for Alkaline and Lithuim #141
///
/// - parameter currVoltage: Current Voltage Reading from Pump
///
Expand All @@ -387,7 +387,7 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
maxVoltage = 1.58
batteryNotification = 0.12
}else{
// if Alkline (default) set min and max linear voltages
// if Alkaline (default) set min and max linear voltages
minVoltage = 1.26
maxVoltage = 1.58
batteryNotification = 0.19
Expand Down Expand Up @@ -737,8 +737,8 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
}
}

/// The Default battery chemistry is Alkline
var batteryChemistry = UserDefaults.standard.batteryChemistry ?? .alkline {
/// The Default battery chemistry is Alkaline
var batteryChemistry = UserDefaults.standard.batteryChemistry ?? .alkaline {
didSet {
UserDefaults.standard.batteryChemistry = batteryChemistry
}
Expand Down
6 changes: 3 additions & 3 deletions Loop/Models/BatteryChemistryType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
import Foundation

enum BatteryChemistryType: Int, CustomStringConvertible {
case alkline = 0
case alkaline = 0
case lithium

var description: String {
switch self {
case .alkline:
return NSLocalizedString("Alkline", comment: "Describing the battery chemistry as Alkline")
case .alkaline:
return NSLocalizedString("Alkaline", comment: "Describing the battery chemistry as Alkaline")
case .lithium:
return NSLocalizedString("Lithium", comment: "Describing the battery chemistry as Lithium")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ extension BatteryTypeSelectionTableViewController {

vc.selectedIndex = value.rawValue
vc.options = (0..<2).flatMap({ BatteryChemistryType(rawValue: $0) }).map { String(describing: $0) }
vc.contextHelp = NSLocalizedString("Alkline and Lithium batteries decay at differing rates. Alkline tend to have a linear voltage drop over time where as lithium cell batteries tend to maintain voltage until the end of thier lifespan. This results in a rapid drop in voltage giving little warning to the user that the battery's life is at an end. Under typical useage in an insulin pump using Loop alkline batteries last approximately 4 to 5 days in a non MySentry compatible pump. Lithium batteries can last between 7 and 8 days. This selection will use different battery voltage decay rates for each of the battery chemistry types and alert the user when a battery is approximately 8 to 10 hours from failure", comment: "Instructions on selecting battery chemistry type")
vc.contextHelp = NSLocalizedString("Alkaline and Lithium batteries decay at differing rates. Alkaline tend to have a linear voltage drop over time whereas lithium cell batteries tend to maintain voltage until the end of their lifespan. Under normal usage in a Non-MySentry compatible Minimed (x22/x15) insulin pump running Loop, Alkaline batteries last approximately 4 to 5 days. Lithium batteries last between 7 and 8 days. This selection will use different battery voltage decay rates for each of the battery chemistry types and alert the user when a battery is approximately 8 to 10 hours from failure.", comment: "Instructions on selecting battery chemistry type")

return vc
}
Expand Down