V4.1.2b - V0.23 of CNN

This commit is contained in:
Graham Jones
2022-10-28 20:07:40 +01:00
parent eb9b0477e4
commit 0c4ba9f080
5 changed files with 52 additions and 47 deletions

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="uk.org.openseizuredetector" package="uk.org.openseizuredetector"
android:versionCode="114" android:versionCode="114"
android:versionName="4.1.2a"> android:versionName="4.1.2b">
<!-- 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" />

Binary file not shown.

View File

@@ -706,6 +706,12 @@ public class MainActivity extends AppCompatActivity {
// We start off with it set to OK, then check for several different abnormal conditions // We start off with it set to OK, then check for several different abnormal conditions
// in turn - the last one that is active is the one that is displayed. // in turn - the last one that is active is the one that is displayed.
tv = (TextView) findViewById(R.id.remoteDbTv); tv = (TextView) findViewById(R.id.remoteDbTv);
if (mConnection.mSdServer.mLogNDA)
tv.setText(getString(R.string.data_sharing_status)
+ ": "
+ getString(R.string.data_sharing_setup_ok)
+ ": " + "NDA Logging");
else
tv.setText(getString(R.string.data_sharing_status) tv.setText(getString(R.string.data_sharing_status)
+ ": " + ": "
+ getString(R.string.data_sharing_setup_ok)); + getString(R.string.data_sharing_setup_ok));
@@ -830,7 +836,6 @@ public class MainActivity extends AppCompatActivity {
pb.setProgressDrawable(pbDrawable); pb.setProgressDrawable(pbDrawable);
// Fault Conditions - We override the values in the UI because we do not know // Fault Conditions - We override the values in the UI because we do not know
// if the stored ones are correct or not with a fault present. // if the stored ones are correct or not with a fault present.
if ((mConnection.mSdServer.mSdData.alarmState == 4) || if ((mConnection.mSdServer.mSdData.alarmState == 4) ||

View File

@@ -25,7 +25,7 @@ import java.util.Map;
public class SdAlgNn { public class SdAlgNn {
private final static String TAG = "SdAlgNn"; private final static String TAG = "SdAlgNn";
private final static String MODEL_PATH = "cnn_v0.22.tflite"; private final static String MODEL_PATH = "cnn_v0.23.tflite";
private String mUrlBase = "https://osdApi.ddns.net"; private String mUrlBase = "https://osdApi.ddns.net";
private InterpreterApi interpreter; private InterpreterApi interpreter;
private Context mContext; private Context mContext;

View File

@@ -3,7 +3,7 @@
<string name="app_name">OpenSeizureDetector</string> <string name="app_name">OpenSeizureDetector</string>
<string name="changelog"> <string name="changelog">
"\n "\n
\nV4.1.0 - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.12) \nV4.1.2 - Added Machine Learning (Artificial Intelligence) Detection Algorithm Option (CNN V0.23) and 'Normal Daily Activity (NDA) logging function
\nV4.0.7 - Improvements to Data Sharing data log manager screen. \nV4.0.7 - Improvements to Data Sharing data log manager screen.
- Introduced the &lt;b>Data Sharing&lt;/b> feature to allow users to share their seizure and false alarm data - Introduced the &lt;b>Data Sharing&lt;/b> feature to allow users to share their seizure and false alarm data
with researchers to help improve the system.&lt;br/> with researchers to help improve the system.&lt;br/>