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

V4.0.5 - add support for 3d data logging + minor bug fixes

Browse Source
This commit is contained in:
Graham Jones
2022-06-04 21:38:19 +01:00
parent 6a0ff7e4c1
commit a66709e5ba
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-4.0.5c.apk → app/release/app-release-4.0.5.apk
View File

Binary file not shown.

2
app/src/main/AndroidManifest.xml
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="101" android:versionCode="101"
android:versionName="4.0.5c"> android:versionName="4.0.5">
<!-- 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" />

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

@@ -205,6 +205,7 @@ public class SdData implements Parcelable {
for (int i = 0; i < rawData.length; i++) { for (int i = 0; i < rawData.length; i++) {
rawArr.put(rawData[i]); rawArr.put(rawData[i]);
} }
//Log.v(TAG,"rawData[0]="+rawData[0]+", rawArr[0]="+rawArr.getDouble(0));
jsonObj.put("rawData", rawArr); jsonObj.put("rawData", rawArr);
JSONArray raw3DArr = new JSONArray(); JSONArray raw3DArr = new JSONArray();
@@ -214,6 +215,7 @@ public class SdData implements Parcelable {
jsonObj.put("rawData3D", raw3DArr); jsonObj.put("rawData3D", raw3DArr);
retval = jsonObj.toString(); retval = jsonObj.toString();
Log.v(TAG,"retval rawData="+retval);
} catch (Exception ex) { } catch (Exception ex) {
Log.v(TAG, "Error Creating Data Object - " + ex.toString()); Log.v(TAG, "Error Creating Data Object - " + ex.toString());
retval = "Error Creating Data Object - " + ex.toString(); retval = "Error Creating Data Object - " + ex.toString();

5
app/src/main/java/uk/org/openseizuredetector/SdDataSource.java
View File

@@ -291,9 +291,10 @@ public abstract class SdDataSource {
} }
int i; int i;
for (i = 0; i < accelVals.length(); i++) { for (i = 0; i < accelVals.length(); i++) {
mSdData.rawData[i] = accelVals.getInt(i); mSdData.rawData[i] = accelVals.getDouble(i);
} }
mSdData.mNsamp = accelVals.length(); mSdData.mNsamp = accelVals.length();
//Log.d(TAG,"accelVals[0]="+accelVals.getDouble(0)+", mSdData.rawData[0]="+mSdData.rawData[0]);
try { try {
accelVals3D = dataObject.getJSONArray("data3D"); accelVals3D = dataObject.getJSONArray("data3D");
Log.v(TAG, "Received " + accelVals3D.length() + " acceleration 3D values, rawData Length is " + mSdData.rawData3D.length); Log.v(TAG, "Received " + accelVals3D.length() + " acceleration 3D values, rawData Length is " + mSdData.rawData3D.length);
@@ -302,7 +303,7 @@ public abstract class SdDataSource {
+ mSdData.rawData3D.length); + mSdData.rawData3D.length);
} }
for (i = 0; i < accelVals3D.length(); i++) { for (i = 0; i < accelVals3D.length(); i++) {
mSdData.rawData3D[i] = accelVals3D.getInt(i); mSdData.rawData3D[i] = accelVals3D.getDouble(i);
} }
} catch (JSONException e) { } catch (JSONException e) {
// If we get an error, just set rawData3D to zero // If we get an error, just set rawData3D to zero