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

Recive data as 3 integers (x,y,z) rather than AccelData structure.

Browse Source
This commit is contained in:
Graham Jones
2016-07-01 19:54:42 +01:00
parent 5bf50d8c7c
commit 5c392b887c
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/assets/pebble_sd.pbw
View File

Binary file not shown.

20
app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
View File

@@ -406,15 +406,29 @@ public class SdDataSourcePebble extends SdDataSource {
numSamples = data.getUnsignedIntegerAsLong(KEY_NUM_RAW_DATA); numSamples = data.getUnsignedIntegerAsLong(KEY_NUM_RAW_DATA);
Log.v(TAG, "numSamples = " + numSamples); Log.v(TAG, "numSamples = " + numSamples);
byte[] rawDataBytes = data.getBytes(KEY_RAW_DATA); byte[] rawDataBytes = data.getBytes(KEY_RAW_DATA);
for (AccelData reading : AccelData.fromDataArray(rawDataBytes)) { for (int i = 0; i < rawDataBytes.length - 6; i += 6) { // 6 bytes per sample
int x = (rawDataBytes[i+0] & 0xff) | (rawDataBytes[i+1] << 8);
int y = (rawDataBytes[i+2] & 0xff) | (rawDataBytes[i+3] << 8);
int z = (rawDataBytes[i+4] & 0xff) | (rawDataBytes[i+5] << 8);
Log.v(TAG,"x="+x+", y="+y+", z="+z);
if (nRawData < MAX_RAW_DATA) { if (nRawData < MAX_RAW_DATA) {
rawData[nRawData] = reading.getMagnitude(); rawData[nRawData] = (int)Math.sqrt(x*x+y*y+z*z);
nRawData++;
} else { } else {
Log.i(TAG, "WARNING - rawData Buffer Full"); Log.i(TAG, "WARNING - rawData Buffer Full");
} }
} }
//for (AccelData reading : AccelData.fromDataArray(rawDataBytes)) {
// if (nRawData < MAX_RAW_DATA) {
// rawData[nRawData] = reading.getMagnitude();
// nRawData++;
// } else {
// Log.i(TAG, "WARNING - rawData Buffer Full");
// }
// }
} }
} }
}; };