diff --git a/CHANGELOG.md b/CHANGELOG.md index 561fe38..065ff7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ V3.2.0 - (NEXT VERSION!) - Added neural network based data analysis. + V3.1.10 - 20oct2019 + - Added option to make a 'null' heart rate reading an alarm rather than fault condition. + V3.1.9 - 14jun2019 - Now requests READ_PHONE_STATE along with SMS permissions (required for some phones to send SMS messages) - Fixed issue with Garmin Seizure Detector not producing warnings. diff --git a/app/release/app-release-3.1.10.apk b/app/release/app-release-3.1.10.apk new file mode 100644 index 0000000..9372dac Binary files /dev/null and b/app/release/app-release-3.1.10.apk differ diff --git a/app/release/output.json b/app/release/output.json index 848b213..de822d9 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":63,"versionName":"3.1.9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":64,"versionName":"3.1.10","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9588f68..18ae8e9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/app/src/main/java/uk/org/openseizuredetector/SdData.java b/app/src/main/java/uk/org/openseizuredetector/SdData.java index 7b4974b..38fb904 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdData.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdData.java @@ -62,6 +62,7 @@ public class SdData implements Parcelable { /* Heart Rate Alarm Settings */ public boolean mHRAlarmActive = false; + public boolean mHRNullAsAlarm = false; public double mHRThreshMin = 40.0; public double mHRTreshMax = 150.0; public double rawData[]; diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java index 41c3330..0038618 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java @@ -322,6 +322,9 @@ public class SdDataSourceGarmin extends SdDataSource { mSdData.mHRAlarmActive = SP.getBoolean("HRAlarmActive", false); Log.v(TAG, "updatePrefs() HRAlarmActive = " + mSdData.mHRAlarmActive); + mSdData.mHRNullAsAlarm = SP.getBoolean("HRNullAsAlarm", false); + Log.v(TAG, "updatePrefs() HRNullAsAlarm = " + mSdData.mHRNullAsAlarm); + prefStr = SP.getString("HRThreshMin", "SET_FROM_XML"); mSdData.mHRThreshMin = (short) Integer.parseInt(prefStr); Log.v(TAG, "updatePrefs() HRThreshMin = " + mSdData.mHRThreshMin); @@ -577,9 +580,15 @@ public class SdDataSourceGarmin extends SdDataSource { /* Check Heart Rate against alarm settings */ if (mSdData.mHRAlarmActive) { if (mSdData.mHR < 0) { - Log.i(TAG,"Heart Rate Fault (HR<0)"); - mSdData.mHRFaultStanding = true; - mSdData.mHRAlarmStanding = false; + if (mSdData.mHRNullAsAlarm) { + Log.i(TAG, "Heart Rate Null - Alarming"); + mSdData.mHRFaultStanding = false; + mSdData.mHRAlarmStanding = true; + } else { + Log.i(TAG, "Heart Rate Fault (HR<0)"); + mSdData.mHRFaultStanding = true; + mSdData.mHRAlarmStanding = false; + } } else if ((mSdData.mHR > mSdData.mHRTreshMax) || (mSdData.mHR < mSdData.mHRThreshMin)) { Log.i(TAG, "Heart Rate Abnormal - " + mSdData.mHR + " bpm"); diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java index a6493ef..c8ac504 100644 --- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java @@ -413,7 +413,8 @@ public class StartupActivity extends Activity { + "\n V3.1.5 - Added repeat alarm beeps during SMS delay to alert user.." + "\n V3.1.6 - Made Cancel Audible button inhibit sending SMS alarms as well as audible beeps" + "\n V3.1.8 - Added READ_PHONE_STATE permission, which seems to be needed for some phones" - + "\n V3.1.9 - Fixed issue with Garmin Seizure Detector not producing warnings. Added faut pips for missing heart rate data if heart rate alarm active" + + "\n V3.1.9 - Fixed issue with Garmin Seizure Detector not producing warnings. Added fault pips for missing heart rate data if heart rate alarm active" + + "\n V3.1.10 - Provided a user option to treat a null heart rate as a fault or an alarm condition" ); // This makes the links display as links, but they do not respond to clicks for some reason... Linkify.addLinks(s, Linkify.ALL); @@ -449,6 +450,7 @@ public class StartupActivity extends Activity { + "\n V3.1.6 - Made Cancel Audible button inhibit sending SMS alarms as well as audible beeps" + "\n V3.1.8 - Added READ_PHONE_STATE permission, which seems to be needed for some phones" + "\n V3.1.9 - Fixed issue with Garmin Seizure Detector not producing warnings. Added faut pips for missing heart rate data if heart rate alarm active" + + "\n V3.1.10 - Provided a user option to treat a null heart rate as a fault or an alarm condition" + "\n " ); // This makes the links display as links, but they do not respond to clicks for some reason... diff --git a/app/src/main/res/xml/seizure_detector_prefs.xml b/app/src/main/res/xml/seizure_detector_prefs.xml index c2c5ab8..a0c0294 100644 --- a/app/src/main/res/xml/seizure_detector_prefs.xml +++ b/app/src/main/res/xml/seizure_detector_prefs.xml @@ -48,6 +48,11 @@ android:key="HRAlarmActive" android:summary="" android:title="Heart Rate Alarm Enabled" /> +