diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5d70e36..d8685c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="101" + android:versionName="4.0.5a"> diff --git a/app/src/main/java/uk/org/openseizuredetector/SdData.java b/app/src/main/java/uk/org/openseizuredetector/SdData.java index 1fc1e4c..3c422c7 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdData.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdData.java @@ -80,6 +80,7 @@ public class SdData implements Parcelable { public double rawData[]; + public double rawData3D[]; int mNsamp = 0; /* Analysis results */ @@ -109,6 +110,7 @@ public class SdData implements Parcelable { public SdData() { simpleSpec = new int[10]; rawData = new double[N_RAW_DATA]; + rawData3D = new double[N_RAW_DATA * 3]; dataTime = new Time(Time.getCurrentTimezone()); } @@ -204,6 +206,12 @@ public class SdData implements Parcelable { } jsonObj.put("rawData", rawArr); + JSONArray raw3DArr = new JSONArray(); + for (int i = 0; i < rawData3D.length; i++) { + raw3DArr.put(rawData3D[i]); + } + jsonObj.put("rawData3D", raw3DArr); + retval = jsonObj.toString(); } catch (Exception ex) { Log.v(TAG, "Error Creating Data Object - " + ex.toString()); @@ -307,6 +315,13 @@ public class SdData implements Parcelable { rawArr.put(rawData[i]); } jsonObj.put("rawData", rawArr); + + JSONArray raw3DArr = new JSONArray(); + for (int i = 0; i < rawData3D.length; i++) { + raw3DArr.put(rawData3D[i]); + } + jsonObj.put("rawData3D", raw3DArr); + } retval = jsonObj.toString(); diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java index 2a64439..6b5f174 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java @@ -254,6 +254,7 @@ public abstract class SdDataSource { String sdVersion; String sdName; JSONArray accelVals = null; + JSONArray accelVals3D = null; Log.v(TAG, "updateFromJSON - " + jsonStr); try { @@ -293,9 +294,20 @@ public abstract class SdDataSource { mSdData.rawData[i] = accelVals.getInt(i); } mSdData.mNsamp = accelVals.length(); - //mNSamp = accelVals.length(); + + accelVals3D = dataObject.getJSONArray("data3D"); + Log.v(TAG, "Received " + accelVals3D.length() + " acceleration 3D values, rawData Length is " + mSdData.rawData3D.length); + if (accelVals3D.length() > mSdData.rawData3D.length) { + mUtil.writeToSysLogFile("ERROR: Received " + accelVals3D.length() + " 3D acceleration values, but rawData3D storage length is " + + mSdData.rawData3D.length); + } + for (i = 0; i < accelVals3D.length(); i++) { + mSdData.rawData3D[i] = accelVals3D.getInt(i); + } + mWatchAppRunningCheck = true; doAnalysis(); + if (mSdData.haveSettings == false) { retVal = "sendSettings"; } else { diff --git a/doc/Installation_Instructions_1.0.pptx b/doc/Installation_Instructions_1.0.pptx new file mode 100644 index 0000000..88290a7 Binary files /dev/null and b/doc/Installation_Instructions_1.0.pptx differ