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

V3.1.2 - Made fall alarms latch, irrespective of the latch alarm setting - this is because falls are transitory so to be useful the alarm has to latch so the user can tell what caused the beep.

Browse Source
This commit is contained in:
Graham Jones
2019-04-22 21:43:19 +01:00
parent 8013b5d56a
commit 111812300e
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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="55"
android:versionName="3.1.1"
android:versionCode="56"
android:versionName="3.1.2"
>
<!--android:allowBackup="false"-->

3
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -626,7 +626,8 @@ public class MainActivity extends AppCompatActivity {
acceptAlarmButton.setText("Accept Alarm");
acceptAlarmButton.setBackgroundColor(Color.DKGRAY);
if (mConnection.mBound)
if (mConnection.mSdServer.isLatchAlarms()) {
if ((mConnection.mSdServer.isLatchAlarms())
|| mConnection.mSdServer.mSdData.mFallActive) {
acceptAlarmButton.setEnabled(true);
} else {
acceptAlarmButton.setEnabled(false);

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

@@ -520,8 +520,11 @@ public class SdDataSourceGarmin extends SdDataSource {
long fallWindowSamp = (mFallWindow*mSdData.mSampleFreq)/1000; // Convert ms to samples.
Log.v(TAG, "check_fall() - fallWindowSamp=" +fallWindowSamp);
// Move window through sample buffer, checking for fall.
mSdData.fallAlarmStanding = false;
// Note - not resetting fallAlarmStanding means that fall alarms will always latch until the 'Accept Alarm' button
// is pressed.
//mSdData.fallAlarmStanding = false;
if (mFallActive) {
mSdData.mFallActive = true;
for (i = 0; i < mSdData.mNsamp - fallWindowSamp; i++) { // i = window start point
// Find max and min acceleration within window.
minAcc = mSdData.rawData[i];
@@ -538,6 +541,7 @@ public class SdDataSourceGarmin extends SdDataSource {
}
}
} else {
mSdData.mFallActive = false;
Log.v(TAG,"check_fall - mFallActive is false - doing nothing");
}
//if (debug) APP_LOG(APP_LOG_LEVEL_DEBUG,"check_fall() - minAcc=%d, maxAcc=%d",