Dev 1.1.1 x22 battery status #259
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // | ||
| // BatteryChemistryType.swift | ||
| // Loop | ||
| // | ||
| // Created by Jerermy Lucas on 11/15/16 pattern derived from Nathan Racklyeft. | ||
| // Copyright © 2016 LoopKit Authors. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| enum BatteryChemistryType: Int, CustomStringConvertible { | ||
| case alkaline = 0 | ||
| case lithium | ||
|
|
||
| var description: String { | ||
| switch self { | ||
| case .alkaline: | ||
| return NSLocalizedString("Alkaline", comment: "Describing the battery chemistry as Alkaline") | ||
| case .lithium: | ||
| return NSLocalizedString("Lithium", comment: "Describing the battery chemistry as Lithium") | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // | ||
| // BatteryTypeSelectionTableViewController.swift | ||
| // Loop | ||
|
Collaborator
There was a problem hiding this comment. Was it not possible to re-use RadioSelectionTableViewController?
Contributor
Author
There was a problem hiding this comment. I am sure it may be. I am just not swift enough to fully comprehend how. So I leveraged the existing pattern Nate had provided. |
||
| // | ||
| // Created by Jerermy Lucas on 11/15/16 pattern derived from Nathan Racklyeft. | ||
| // Copyright © 2016 LoopKit Authors. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
|
|
||
| protocol BatteryTypeSelectionTableViewControllerDelegate: class { | ||
| func batteryTypeSelectionTableViewControllerDidChangeSelectedIndex(_ controller: BatteryTypeSelectionTableViewController) | ||
| } | ||
|
|
||
|
|
||
| class BatteryTypeSelectionTableViewController: UITableViewController, IdentifiableClass { | ||
|
|
||
| var options = [String]() | ||
|
|
||
| var selectedIndex: Int? { | ||
| didSet { | ||
| if let oldValue = oldValue, oldValue != selectedIndex { | ||
| tableView.cellForRow(at: IndexPath(row: oldValue, section: 0))?.accessoryType = .none | ||
| } | ||
|
|
||
| if let selectedIndex = selectedIndex, oldValue != selectedIndex { | ||
| tableView.cellForRow(at: IndexPath(row: selectedIndex, section: 0))?.accessoryType = .checkmark | ||
|
|
||
| delegate?.batteryTypeSelectionTableViewControllerDidChangeSelectedIndex(self) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| var contextHelp: String? | ||
|
|
||
| weak var delegate: BatteryTypeSelectionTableViewControllerDelegate? | ||
|
|
||
| convenience init() { | ||
| self.init(style: .grouped) | ||
| } | ||
|
|
||
| // MARK: - Table view data source | ||
|
|
||
| override func numberOfSections(in tableView: UITableView) -> Int { | ||
| return 1 | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | ||
| return options.count | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | ||
| let cell = tableView.dequeueReusableCell(withIdentifier: "Cell") ?? UITableViewCell(style: .default, reuseIdentifier: "Cell") | ||
|
|
||
| cell.textLabel?.text = options[indexPath.row] | ||
| cell.accessoryType = selectedIndex == indexPath.row ? .checkmark : .none | ||
|
|
||
| return cell | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? { | ||
| return contextHelp | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | ||
| selectedIndex = indexPath.row | ||
|
|
||
| tableView.deselectRow(at: indexPath, animated: true) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| extension BatteryTypeSelectionTableViewController { | ||
| typealias T = BatteryTypeSelectionTableViewController | ||
|
|
||
| static func insulinDataSource(_ value: BatteryChemistryType) -> T { | ||
| let vc = T() | ||
|
|
||
| vc.selectedIndex = value.rawValue | ||
| vc.options = (0..<2).flatMap({ BatteryChemistryType(rawValue: $0) }).map { String(describing: $0) } | ||
| 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 | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we already have a battery % for x23 devices, let's track battery % as a single ivar.
Updating that ivar can trigger both battery change event (
AnalyticsManager.sharedManager.pumpBatteryWasReplaced()) and notification (NotificationManager.sendPumpBatteryLowNotification()), and then the StatusTableViewController can check one place for battery percent, instead of checking bothdataManager.latestPumpStatusFromMySentry.batteryRemainingPercentanddataManager.x22BatteryPercentRemainingThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't use magic number sentinels; use an optional.
Since percentage is derived from chemistry, and chemistry can be changed at any time, this shouldn't be stored at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I understand it you are saying I should write the Battery % Remaining to dataManager.latestPumpStatusFromMySentry.batteryRemainingPercent. I totally agree reuse of the already existing structure would be great, however I am unsure how to write to the batteryRemainingPercent var.
latestPumpStatusFromMySentry?.batteryRemainingPercent = ((currVoltage - minVoltage)/(maxVoltage - minVoltage))I receive an error
Cannot assign to property: 'batteryRemainingPercent' is a 'let' constant