HRM: add value filtering and improve average heart rate display

InfiniTimeOrg · Oct 2, 2024 · 451122b · 451122b
1 parent 72b4af4
commit 451122b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/InfiniLink/BLE/BLEUpdateHandler.swift b/InfiniLink/BLE/BLEUpdateHandler.swift
@@ -5,7 +5,7 @@
 //  Created by Alex Emry on 10/1/21.
 //
 //
-    
+
 
 import CoreBluetooth
 import CoreData
@@ -14,17 +14,22 @@ import SwiftUI
 struct BLEUpdatedCharacteristicHandler {
     @ObservedObject var healthKitManager = HealthKitManager.shared
 
+    @FetchRequest(sortDescriptors: [NSSortDescriptor(keyPath: \ChartDataPoint.timestamp, ascending: true)], predicate: NSPredicate(format: "chart == 0"))
+    private var chartPoints: FetchedResults<ChartDataPoint>
+
     let bleManager = BLEManager.shared
     let bleManagerVal = BLEManagerVal.shared
     let weatherController = WeatherController()
     let ble_fs = BLEFSHandler.shared
 
+    @AppStorage("filterHRMValues") var filterHRM: Bool = false
+    @AppStorage("lastHRMValueTimestamp") var lastHRMValueTimestamp: Double = 0
 
     // function to translate heart rate to decimal, copied straight up from this tut: https://www.raywenderlich.com/231-core-bluetooth-tutorial-for-ios-heart-rate-monitor#toc-anchor-014
     func heartRate(from characteristic: CBCharacteristic) -> Int {
         guard let characteristicData = characteristic.value else { return -1 }
         let byteArray = [UInt8](characteristicData)
-
+        
         let firstBitValue = byteArray[0] & 0x01
         if firstBitValue == 0 {
             // Heart Rate Value Format is in the 2nd byte
@@ -44,10 +49,30 @@ struct BLEUpdatedCharacteristicHandler {
             MusicController.shared.controlMusic(controlNumber: Int(musicControl[0]))
         case bleManagerVal.cbuuidList.hrm:
             let bpm = heartRate(from: characteristic)
+            let dataPoints = ChartManager.shared.convert(results: chartPoints)
+            let lastDataPoint = dataPoints.last
+
             bleManagerVal.heartBPM = Double(bpm)
-            healthKitManager.writeHeartRate(date: Date(), dataToAdd: bleManagerVal.heartBPM)
+
             if bpm != 0 {
-                ChartManager.shared.addItem(dataPoint: DataPoint(date: Date(), value: Double(bpm), chart: ChartsAsInts.heart.rawValue))
+                let currentTime = Date().timeIntervalSince1970
+                let timeDifference = currentTime - lastHRMValueTimestamp
+
+                if let referenceValue = lastDataPoint?.value, filterHRM && (bpm > 40 && bpm < 210) {
+                    let isWithinRange = abs(referenceValue - bleManagerVal.heartBPM) <= 25
+
+                    if isWithinRange {
+                        updateHeartRate(bpm: bpm)
+                    } else {
+                        if timeDifference <= 10 {
+                            updateHeartRate(bpm: bpm)
+                        } else {
+                            print("Abnormal value, should be filtered")
+                        }
+                    }
+                } else {
+                    updateHeartRate(bpm: bpm)
+                }
             }
         case bleManagerVal.cbuuidList.bat:
             guard let value = characteristic.value else {
@@ -73,7 +98,7 @@ struct BLEUpdatedCharacteristicHandler {
 
                 let currentSteps = value
                 let newSteps = Double(bleManagerVal.stepCount)
-
+                
                 let stepsToAdd = newSteps - currentSteps!
                 healthKitManager.writeSteps(date: Date(), stepsToAdd: stepsToAdd)
             }
@@ -88,4 +113,11 @@ struct BLEUpdatedCharacteristicHandler {
             break
         }
     }
+
+    func updateHeartRate(bpm: Int) {
+        let currentTime = Date().timeIntervalSince1970
+        lastHRMValueTimestamp = currentTime
+        healthKitManager.writeHeartRate(date: Date(), dataToAdd: bleManagerVal.heartBPM)
+        ChartManager.shared.addItem(dataPoint: DataPoint(date: Date(), value: Double(bpm), chart: ChartsAsInts.heart.rawValue))
+    }
 }
diff --git a/InfiniLink/Core/Heart/HeartView.swift b/InfiniLink/Core/Heart/HeartView.swift
@@ -94,8 +94,17 @@ struct HeartView: View {
                                 .imageScale(.large)
                             Text(String(format: "%.0f", bleManagerVal.heartBPM) + " " + NSLocalizedString("bpm", comment: "BPM"))
                                 .font(.system(size: 32).weight(.bold))
-                            Text("Avg: " + String(Int(vDSP.mean(dataPoints.map({ $0.value })))) + " " + NSLocalizedString("bpm", comment: "BPM"))
-                                .foregroundColor(.primary)
+                            if dataPoints.count >= 5 {
+                                let points = dataPoints.map { $0.value }.filter { $0 > 50 && $0 < 200 }
+
+                                if !points.isEmpty {
+                                    let meanValue = vDSP.mean(points)
+                                    let formattedAvg = String(Int(meanValue))
+
+                                    Text("Avg: " + formattedAvg + " " + NSLocalizedString("bpm", comment: "BPM"))
+                                        .foregroundColor(.primary)
+                                }
+                            }
                         }
                         .foregroundColor(.red)
                     }

diff --git a/InfiniLink/Core/Weather/WeatherController.swift b/InfiniLink/Core/Weather/WeatherController.swift
@@ -330,8 +330,10 @@ class WeatherController: NSObject, ObservableObject, CLLocationManagerDelegate {
                         DebugLogManager.shared.debug(error: debugDescription, log: .app, date: Date())
                     }
 
-                    bleManagerVal.weatherInformation.icon = Int(getIcon_NWS(description: json["features"][idx]["properties"]["textDescription"].stringValue))
-                    bleManagerVal.weatherInformation.shortDescription = json["features"][idx]["properties"]["textDescription"].stringValue
+                    DispatchQueue.main.async {
+                        self.bleManagerVal.weatherInformation.icon = Int(self.getIcon_NWS(description: json["features"][idx]["properties"]["textDescription"].stringValue))
+                        self.bleManagerVal.weatherInformation.shortDescription = json["features"][idx]["properties"]["textDescription"].stringValue
+                    }
                     break
                 }
             }