Fixed problem with analysing only 3d data rather than vector magnitude.

This commit is contained in:
Graham Jones
2024-03-22 16:02:24 +00:00
parent fa024d72db
commit 705e146a33
4 changed files with 3 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
OpenSeizureDetector Android App - Change Log OpenSeizureDetector Android App - Change Log
============================================ ============================================
V4.2.3 - Uses 3d accelerometer data to calculate magnitude if vector magnitude is not sent from data source. V4.2.3c - Uses 3d accelerometer data to calculate magnitude if vector magnitude is not sent from data source.
V4.2.2 - Added support for PineTime OSD Status reporting. V4.2.2 - Added support for PineTime OSD Status reporting.
V4.2.1 - Added support for PineTime wathes using the Bluetooth Data Source V4.2.1 - Added support for PineTime wathes using the Bluetooth Data Source
V4.1.0 - Added experimental support for neural network based seizure detector. V4.1.0 - Added experimental support for neural network based seizure detector.

View File

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:versionCode="137" android:versionCode="137"
android:versionName="4.2.3a"> android:versionName="4.2.3c">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

View File

@@ -363,6 +363,7 @@ public abstract class SdDataSource {
z = mSdData.rawData3D[i*3 + 2]; z = mSdData.rawData3D[i*3 + 2];
mSdData.rawData[i] = Math.sqrt(x*x + y*y + z*z); mSdData.rawData[i] = Math.sqrt(x*x + y*y + z*z);
} }
mSdData.mNsamp = 125;
} else { } else {
// If we do not have vector magnitude or 3d data, set the vector magnitude array to zero. // If we do not have vector magnitude or 3d data, set the vector magnitude array to zero.
Log.e(TAG, "ERROR - no accelerometer data received - setting it to zero"); Log.e(TAG, "ERROR - no accelerometer data received - setting it to zero");