Просмотр исходного кода

fix in logging bluetooth transmitter address

(cherry picked from commit b097527c092abb3b8d620846dddc49c2b89557be)
Johan Degraeve 3 лет назад
Родитель
Сommit
70b39e2490

+ 1 - 1
FreeAPS/Sources/APS/CGM/AppGroupSource.swift

@@ -20,7 +20,7 @@ struct AppGroupSource: GlucoseSource {
             return []
         }
 
-        debug(.deviceManager, "BluetoothTransmitter.swift in fetchLastBGs")
+        debug(.deviceManager, "in fetchLastBGs")
 
         HeartBeatManager.shared.checkCGMBluetoothTransmitter(sharedUserDefaults: sharedDefaults)
 

+ 7 - 5
FreeAPS/Sources/APS/CGM/HeartBeatManager.swift

@@ -23,6 +23,13 @@ class HeartBeatManager {
     /// - parameters:
     ///     - sharedData : shared User Defaults
     public func checkCGMBluetoothTransmitter(sharedUserDefaults: UserDefaults) {
+
+        if let sharedTransmitterAddress = sharedUserDefaults.string(forKey: keyForcgmTransmitterDeviceAddress) {
+            debug(.deviceManager, "in checkCGMBluetoothTransmitter, sharedTransmitterAddress = \(sharedTransmitterAddress)")
+        } else {
+            debug(.deviceManager, "in checkCGMBluetoothTransmitter, sharedTransmitterAddress = nil")
+        }
+
         if !initialSetupDone {
             debug(.deviceManager, "in checkCGMBluetoothTransmitter, initial setup")
 
@@ -39,11 +46,6 @@ class HeartBeatManager {
                 .deviceManager,
                 "UserDefaults.standard.cgmTransmitterDeviceAddress != sharedUserDefaults.string(forKey: keyForcgmTransmitterDeviceAddress)"
             )
-            if let sharedTransmitterAddress = sharedUserDefaults.string(forKey: keyForcgmTransmitterDeviceAddress) {
-                debug(.deviceManager, "in checkCGMBluetoothTransmitter, sharedTransmitterAddress = \(sharedTransmitterAddress)")
-            } else {
-                debug(.deviceManager, "in checkCGMBluetoothTransmitter, sharedTransmitterAddress = nil")
-            }
 
             // assign local copy of cgmTransmitterDeviceAddress to the value stored in sharedUserDefaults (possibly nil value)
             UserDefaults.standard.cgmTransmitterDeviceAddress = sharedUserDefaults