gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V3.1.10 - Added user option to treat null heart rate as an alarm condition rather than a fault.

Browse Source
This commit is contained in:
Graham Jones
2019-10-20 18:01:00 +01:00
parent 74cde048ed
commit 102a5c2a94
8 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -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.

BIN
app/release/app-release-3.1.10.apk Normal file
View File

Binary file not shown.

2
app/release/output.json
View File

@@ -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":{}}]
[{"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":{}}]

4
app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="63"
android:versionName="3.1.9"
android:versionCode="64"
android:versionName="3.1.10"
>
<!--android:allowBackup="false"-->

1
app/src/main/java/uk/org/openseizuredetector/SdData.java
View File

@@ -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[];

11
app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java
View File

@@ -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,10 +580,16 @@ 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)");
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");
mSdData.mHRFaultStanding = false;

4
app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
View File

@@ -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...

5
app/src/main/res/xml/seizure_detector_prefs.xml
View File

@@ -48,6 +48,11 @@
android:key="HRAlarmActive"
android:summary=""
android:title="Heart Rate Alarm Enabled" />
<CheckBoxPreference
android:defaultValue="false"
android:key="HRNullAsAlarm"
android:summary=""
android:title="Treat a Null heart rate as an alarm condition" />
<EditTextPreference
android:defaultValue="40"
android:key="HRThreshMin"