Skip to content

support share-only cgm source #426

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

Merged
merged 2 commits into from
Apr 3, 2017
Merged

support share-only cgm source #426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5439c7b
fall back to getting cgm data from share if no others are configured
ps2 Mar 21, 2017
a16c762
use absence of g5 transmitter to indicate share-only setup.
ps2 Apr 2, 2017
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
use absence of g5 transmitter to indicate share-only setup.
  • Loading branch information
@ps2
ps2 committed Apr 3, 2017
commit a16c762e260bc3cdce6120f9bfa5df0ea7f103fc
2 changes: 1 addition & 1 deletion Loop/Extensions/NSUserDefaults.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ extension UserDefaults {
return .g5(transmitterID: transmitterID)
}

return .share
return nil
}
}
set {
Expand Down
18 changes: 10 additions & 8 deletions Loop/Managers/CGM/DexCGMManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,20 @@ final class ShareClientManager: CGMManager {


final class G5CGMManager: DexCGMManager, TransmitterDelegate {
private let transmitter: Transmitter
private let transmitter: Transmitter?

init?(transmitterID: String?) {
guard let transmitterID = transmitterID else {
return nil
init(transmitterID: String?) {
if let transmitterID = transmitterID {
self.transmitter = Transmitter(ID: transmitterID, passiveModeEnabled: true)
} else {
self.transmitter = nil
}

self.transmitter = Transmitter(ID: transmitterID, passiveModeEnabled: true)

super.init()

self.transmitter.delegate = self
self.providesBLEHeartbeat = self.transmitter != nil

self.transmitter?.delegate = self
}

override var sensorState: SensorDisplayable? {
Expand Down Expand Up @@ -150,7 +152,7 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
return [
"## G5CGMManager",
"latestReading: \(String(describing: latestReading))",
"transmitter: \(transmitter)",
"transmitter: \(String(describing: transmitter))",
super.debugDescription,
""
].joined(separator: "\n")
Expand Down
9 changes: 1 addition & 8 deletions Loop/Models/CGM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ enum CGM {
case g5(transmitterID: String?)
case g4
case enlite
case share

var appURL: URL? {
switch self {
case .g4, .share:
case .g4:
return URL(string: "dexcomshare://")
case .g5:
return URL(string: "dexcomcgm://")
Expand All @@ -33,8 +32,6 @@ enum CGM {
return G4CGMManager()
case .g5(let transmitterID):
return G5CGMManager(transmitterID: transmitterID)
case .share:
return ShareClientManager()
}
}
}
Expand All @@ -60,8 +57,6 @@ extension CGM: RawRepresentable {
self = .g4
case .enlite?:
self = .enlite
case .share?:
self = .share
case .none:
return nil
}
Expand All @@ -71,15 +66,13 @@ extension CGM: RawRepresentable {
case g5
case g4
case enlite
case share
}

private var type: CGMType {
switch self {
case .g5: return .g5
case .g4: return .g4
case .enlite: return .enlite
case .share: return .share
}
}

Expand Down
6 changes: 3 additions & 3 deletions Loop/View Controllers/SettingsTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
tableView.insertRows(at: [IndexPath(row: CGMRow.g5TransmitterID.rawValue, section:Section.cgm.rawValue)], with: .top)
} else {
removeG5TransmitterIDRow()
dataManager.cgm = .share
dataManager.cgm = nil
}
tableView.endUpdates()
}
Expand All @@ -699,7 +699,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
setEnliteSwitchOff()
dataManager.cgm = .g4
} else {
dataManager.cgm = .share
dataManager.cgm = nil
}
tableView.endUpdates()
}
Expand All @@ -711,7 +711,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
setG4SwitchOff()
dataManager.cgm = .enlite
} else {
dataManager.cgm = .share
dataManager.cgm = nil
}
tableView.endUpdates()
}
Expand Down