Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Loop/Managers/DeviceDataManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,9 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
switch transmitterState {
case .Ready(let transmitter):
transmitter.delegate = self
rileyLinkManager.timerTickEnabled = false
case .NeedsConfiguration:
break
rileyLinkManager.timerTickEnabled = true
}
}
}
Expand Down Expand Up @@ -717,7 +718,6 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes

super.init()

rileyLinkManager.timerTickEnabled = false
rileyLinkManagerObserver = NSNotificationCenter.defaultCenter().addObserverForName(nil, object: rileyLinkManager, queue: nil) { [weak self] (note) -> Void in
self?.receivedRileyLinkManagerNotification(note)
}
Expand Down
2 changes: 1 addition & 1 deletion Loop/View Controllers/SettingsTableViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class SettingsTableViewController: UITableViewController, DailyValueScheduleTabl
configCell.textLabel?.text = NSLocalizedString("Pump ID", comment: "The title text for the pump ID config value")
configCell.detailTextLabel?.text = dataManager.pumpID ?? TapToSetString
case .TransmitterID:
configCell.textLabel?.text = NSLocalizedString("Transmitter ID", comment: "The title text for the transmitter ID config value")
configCell.textLabel?.text = NSLocalizedString("G5 Transmitter ID", comment: "The title text for the Dexcom G5 transmitter ID config value")
configCell.detailTextLabel?.text = dataManager.transmitterID ?? TapToSetString
case .BasalRate:
configCell.textLabel?.text = NSLocalizedString("Basal Rates", comment: "The title text for the basal rate schedule")
Expand Down