From 8489d818165e35cab78727dc2e0b4eee00c8141a Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Sat, 17 Jun 2023 21:10:39 +0100
Subject: [PATCH] Corrected HR algorithm to use average HR for average hr
 assessment, rather than current HR - fixes #105.   Also updates main activity
 to highilight HR section if any HR algorithm goes into alarm.

---
 .../main/java/uk/org/openseizuredetector/MainActivity.java   | 5 ++++-
 app/src/main/java/uk/org/openseizuredetector/SdAlgHr.java    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 1f22dd9..46586c2 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -663,7 +663,10 @@ public class MainActivity extends AppCompatActivity {
                                 +Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n"
                                 + getString(R.string.SpO2)+" = ---%");
                     }
-                    if (mConnection.mSdServer.mSdData.mHRAlarmStanding || mConnection.mSdServer.mSdData.mO2SatAlarmStanding) {
+                    if (mConnection.mSdServer.mSdData.mHRAlarmStanding
+                            || mConnection.mSdServer.mSdData.mAdaptiveHrAlarmStanding
+                            || mConnection.mSdServer.mSdData.mAverageHrAlarmStanding
+                            || mConnection.mSdServer.mSdData.mO2SatAlarmStanding) {
                         tv.setBackgroundColor(alarmColour);
                         tv.setTextColor(alarmTextColour);
                     } else if (mConnection.mSdServer.mSdData.mHRFaultStanding || mConnection.mSdServer.mSdData.mO2SatFaultStanding) {
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdAlgHr.java b/app/src/main/java/uk/org/openseizuredetector/SdAlgHr.java
index 819e908..cf86db3 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdAlgHr.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdAlgHr.java
@@ -161,10 +161,10 @@ public class SdAlgHr {
         double avHr = getAverageHrAverage();
 
         retVal = false;
-        if (hrVal < mAverageHrAlarmThreshMin) {
+        if (avHr < mAverageHrAlarmThreshMin) {
             retVal = true;
         }
-        if (hrVal > mAverageHrAlarmThreshMax) {
+        if (avHr > mAverageHrAlarmThreshMax) {
             retVal = true;
         }
         Log.d(TAG, "checkAverageHr() - hrVal="+hrVal+", avHr="+avHr+", thresholds=("+mAverageHrAlarmThreshMin+", "+mAverageHrAlarmThreshMin+"): Alarm="+retVal);