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.

This commit is contained in:
Graham Jones
2023-06-17 21:10:39 +01:00
parent 49cb28d431
commit 8489d81816
2 changed files with 6 additions and 3 deletions

View File

@@ -663,7 +663,10 @@ public class MainActivity extends AppCompatActivity {
+Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n" +Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage)+") bpm\n"
+ getString(R.string.SpO2)+" = ---%"); + 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.setBackgroundColor(alarmColour);
tv.setTextColor(alarmTextColour); tv.setTextColor(alarmTextColour);
} else if (mConnection.mSdServer.mSdData.mHRFaultStanding || mConnection.mSdServer.mSdData.mO2SatFaultStanding) { } else if (mConnection.mSdServer.mSdData.mHRFaultStanding || mConnection.mSdServer.mSdData.mO2SatFaultStanding) {

View File

@@ -161,10 +161,10 @@ public class SdAlgHr {
double avHr = getAverageHrAverage(); double avHr = getAverageHrAverage();
retVal = false; retVal = false;
if (hrVal < mAverageHrAlarmThreshMin) { if (avHr < mAverageHrAlarmThreshMin) {
retVal = true; retVal = true;
} }
if (hrVal > mAverageHrAlarmThreshMax) { if (avHr > mAverageHrAlarmThreshMax) {
retVal = true; retVal = true;
} }
Log.d(TAG, "checkAverageHr() - hrVal="+hrVal+", avHr="+avHr+", thresholds=("+mAverageHrAlarmThreshMin+", "+mAverageHrAlarmThreshMin+"): Alarm="+retVal); Log.d(TAG, "checkAverageHr() - hrVal="+hrVal+", avHr="+avHr+", thresholds=("+mAverageHrAlarmThreshMin+", "+mAverageHrAlarmThreshMin+"): Alarm="+retVal);