Skip to content

Commit e0bf18f

Browse files
committed
Merge branch 'dev'
2 parents aeff00f + 4da3d24 commit e0bf18f

File tree

2 files changed

+50
-0
lines changed

2 files changed

+50
-0
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Submodule CGMBLEKit 995e861..204735f:
2+
diff --git a/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift b/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift
3+
index c641180..80f7cdb 100644
4+
--- a/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift
5+
+++ b/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift
6+
@@ -26,7 +26,7 @@ public struct TransmitterManagerState: RawRepresentable, Equatable {
7+
8+
public init(
9+
transmitterID: String,
10+
- shouldSyncToRemoteService: Bool = false,
11+
+ shouldSyncToRemoteService: Bool = true,
12+
transmitterStartDate: Date? = nil,
13+
sensorStartOffset: UInt32? = nil
14+
) {
15+
Submodule G7SensorKit 83d8aaf..e700cf1:
16+
diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift
17+
index 948b02f..95538dd 100644
18+
--- a/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift
19+
+++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift
20+
@@ -18,7 +18,7 @@ public struct G7CGMManagerState: RawRepresentable, Equatable {
21+
public var latestReading: G7GlucoseMessage?
22+
public var latestReadingTimestamp: Date?
23+
public var latestConnect: Date?
24+
- public var uploadReadings: Bool = false
25+
+ public var uploadReadings: Bool = true
26+
27+
init() {
28+
}
29+
@@ -31,7 +31,7 @@ public struct G7CGMManagerState: RawRepresentable, Equatable {
30+
}
31+
self.latestReadingTimestamp = rawValue["latestReadingTimestamp"] as? Date
32+
self.latestConnect = rawValue["latestConnect"] as? Date
33+
- self.uploadReadings = rawValue["uploadReadings"] as? Bool ?? false
34+
+ self.uploadReadings = rawValue["uploadReadings"] as? Bool ?? true
35+
}
36+
37+
public var rawValue: RawValue {
38+
diff --git a/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift b/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift
39+
index 93bff10..5d4d452 100644
40+
--- a/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift
41+
+++ b/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift
42+
@@ -23,7 +23,7 @@ class G7SettingsViewModel: ObservableObject {
43+
@Published private(set) var activatedAt: Date?
44+
@Published private(set) var lastConnect: Date?
45+
@Published private(set) var latestReadingTimestamp: Date?
46+
- @Published var uploadReadings: Bool = false {
47+
+ @Published var uploadReadings: Bool = true {
48+
didSet {
49+
cgmManager.uploadReadings = uploadReadings
50+
}

0 commit comments

Comments
 (0)