Skip to content

Parallel to LoopKit PR 25: Add dexcom one plus #2

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
Mar 28, 2024
Merged

Parallel to LoopKit PR 25: Add dexcom one plus #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b37518
Add Dexcom One+ to allowed prefix
marionbarker Mar 22, 2024
4503041
Make G7 startup message more generic
marionbarker Mar 22, 2024
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
3 changes: 2 additions & 1 deletion G7SensorKit/G7CGMManager/G7Sensor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ public final class G7Sensor: G7BluetoothManagerDelegate {
}

/// The Dexcom G7 advertises a peripheral name of "DXCMxx", and later reports a full name of "Dexcomxx"
if name.hasPrefix("DXCM") {
/// Dexcom One+ peripheral name start with "DX02"
if name.hasPrefix("DXCM") || name.hasPrefix("DX02"){
// If we're following this name or if we're scanning, connect
if let sensorName = sensorID, name.suffix(2) == sensorName.suffix(2) {
return .makeActive
Expand Down
2 changes: 1 addition & 1 deletion G7SensorKitUI/Views/G7StartupView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct G7StartupView: View {
.frame(height: 120)
.padding(.horizontal)
}.frame(maxWidth: .infinity)
Text(LocalizedString("Loop can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.", comment: "Descriptive text on G7StartupView"))
Text(LocalizedString("This app can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.", comment: "Descriptive text on G7StartupView"))
.fixedSize(horizontal: false, vertical: true)
.foregroundColor(.secondary)
Spacer()
Expand Down