just for testing, fetch glucose timer from 60 to 3 seconds

(cherry picked from commit 99be04dc6980c56bc0229c4de1b78f9005c2a856)

FreeAPS/Sources/APS/CGM/AppGroupSource.swift

@@ -20,8 +20,8 @@ struct AppGroupSource: GlucoseSource {
             return []
         }
 
-        debug(.deviceManager, "in fetchLastBGs")
-        
+        debug(.deviceManager, "BluetoothTransmitter.swift in fetchLastBGs")
+
         HeartBeatManager.shared.checkCGMBluetoothTransmitter(sharedUserDefaults: sharedDefaults)
 
         let decoded = try? JSONSerialization.jsonObject(with: sharedData, options: [])

FreeAPS/Sources/APS/CGM/HeartBeatManager.swift

@@ -23,49 +23,44 @@ class HeartBeatManager {
     /// - parameters:
     ///     - sharedData : shared User Defaults
     public func checkCGMBluetoothTransmitter(sharedUserDefaults: UserDefaults) {
-        
         if !initialSetupDone {
-            
             debug(.deviceManager, "in checkCGMBluetoothTransmitter, initial setup")
-            
+
             initialSetupDone = true
 
             // set to nil, this will force recreation of bluetooth transmitter at app startup
             UserDefaults.standard.cgmTransmitterDeviceAddress = nil
-            
         }
 
         if UserDefaults.standard.cgmTransmitterDeviceAddress != sharedUserDefaults
             .string(forKey: keyForcgmTransmitterDeviceAddress)
         {
-
-            debug(.deviceManager, "UserDefaults.standard.cgmTransmitterDeviceAddress != sharedUserDefaults.string(forKey: keyForcgmTransmitterDeviceAddress)")
+            debug(
+                .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
                 .string(forKey: keyForcgmTransmitterDeviceAddress)
 
             // assign new bluetoothTransmitter. If return value is nil, and if it was not nil before, and if it was currently connected then it will disconnect automatically, because there's no other reference to it, hence deinit will be called
             bluetoothTransmitter = setupBluetoothTransmitter(sharedData: sharedUserDefaults)
-                
         }
     }
 
     private func setupBluetoothTransmitter(sharedData: UserDefaults) -> BluetoothTransmitter? {
-        
         // if sharedUserDefaults.cgmTransmitterDeviceAddress is not nil then, create a new bluetoothTranmsitter instance
         if let cgmTransmitterDeviceAddress = sharedData.string(forKey: keyForcgmTransmitterDeviceAddress) {
-            
             // unwrap cgmTransmitter_CBUUID_Service and cgmTransmitter_CBUUID_Receive
             if let cgmTransmitter_CBUUID_Service = sharedData.string(forKey: keyForcgmTransmitter_CBUUID_Service),
                let cgmTransmitter_CBUUID_Receive = sharedData.string(forKey: keycgmTransmitter_CBUUID_Receive)
             {
-                
                 // a new cgm transmitter has been setup in xDrip4iOS
                 // we will connect to the same transmitter here so it can be used as heartbeat
                 let newBluetoothTransmitter = BluetoothTransmitter(
@@ -75,8 +70,11 @@ class HeartBeatManager {
                     heartbeat: {}
                 )
 
-                debug(.deviceManager, "in setupBluetoothTransmitter, cgmTransmitterDeviceAddress in shared user defaults is not nil")
-                
+                debug(
+                    .deviceManager,
+                    "in setupBluetoothTransmitter, cgmTransmitterDeviceAddress in shared user defaults is not nil"
+                )
+
                 return newBluetoothTransmitter
 
             } else {
@@ -87,7 +85,7 @@ class HeartBeatManager {
         }
 
         debug(.deviceManager, "in setupBluetoothTransmitter, cgmTransmitterDeviceAddress in shared user defaults is nil")
-        
+
         return nil
     }
 }

FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -16,7 +16,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
     @Injected() var deviceDataManager: DeviceDataManager!
 
     private var lifetime = Lifetime()
-    private let timer = DispatchTimer(timeInterval: 1.minutes.timeInterval)
+    private let timer = DispatchTimer(timeInterval: TimeInterval(3.0))
 
     private lazy var dexcomSource = DexcomSource()
     private lazy var simulatorSource = GlucoseSimulatorSource()