some magic to reduce yellow loops

FreeAPS/Sources/APS/DeviceDataManager.swift

@@ -86,7 +86,6 @@ final class BaseDeviceDataManager: DeviceDataManager, Injectable {
 
     func heartbeat(date: Date, force: Bool) {
         if force {
-            lastHeartBeatTime = date
             updatePumpData()
             return
         }
@@ -164,9 +163,7 @@ extension BaseDeviceDataManager: PumpManagerDelegate {
 
     func pumpManagerBLEHeartbeatDidFire(_: PumpManager) {
         debug(.deviceManager, "Pump Heartbeat")
-        if glucoseStorage.isGlucoseFresh() {
-            heartbeat(date: Date(), force: false)
-        }
+        heartbeat(date: Date(), force: false)
     }
 
     func pumpManagerMustProvideBLEHeartbeat(_: PumpManager) -> Bool {

FreeAPS/Sources/APS/GlucoseManager.swift

@@ -39,8 +39,6 @@ final class BaseGlucoseManager: GlucoseManager, Injectable {
                 if !filtered.isEmpty {
                     debug(.nightscout, "New glucose found")
                     self.apsManager.heartbeat(date: date, force: true)
-                } else {
-                    self.apsManager.heartbeat(date: date, force: false)
                 }
             }
             .store(in: &lifetime)

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -91,7 +91,7 @@ extension Home {
                     if viewModel.units == .mmolL {
                         Text(
                             targetFormatter
-                                .string(from: tepmTarget.targetBottom.asMmolL as NSNumber)! + " \(viewModel.units.rawValue)"
+                                .string(from: tepmTarget.targetBottom.asMmolL as NSNumber)!
                         )
                         .font(.caption)
                         .foregroundColor(.secondary)
@@ -104,10 +104,13 @@ extension Home {
                             )
                             .font(.caption)
                             .foregroundColor(.secondary)
+                        } else {
+                            Text(viewModel.units.rawValue).font(.caption)
+                                .foregroundColor(.secondary)
                         }
 
                     } else {
-                        Text(targetFormatter.string(from: tepmTarget.targetBottom as NSNumber)! + " \(viewModel.units.rawValue)")
+                        Text(targetFormatter.string(from: tepmTarget.targetBottom as NSNumber)!)
                             .font(.caption)
                             .foregroundColor(.secondary)
                         if tepmTarget.targetBottom != tepmTarget.targetTop {
@@ -116,6 +119,9 @@ extension Home {
                             Text(targetFormatter.string(from: tepmTarget.targetTop as NSNumber)! + " \(viewModel.units.rawValue)")
                                 .font(.caption)
                                 .foregroundColor(.secondary)
+                        } else {
+                            Text(viewModel.units.rawValue).font(.caption)
+                                .foregroundColor(.secondary)
                         }
                     }
                 }

FreeAPS/Sources/Services/Network/NightscoutAPI.swift

@@ -31,7 +31,7 @@ extension NightscoutAPI {
     func checkConnection() -> AnyPublisher<Void, Swift.Error> {
         struct Check: Codable, Equatable {
             var eventType = "Note"
-            var enteredBy = "feeaps-x://"
+            var enteredBy = "freeaps-x://"
             var notes = "FreeAPS X connected"
         }
         let check = Check()