From 5c392b887c0d63c32634dd3751084fa860e1d4d8 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Fri, 1 Jul 2016 19:54:42 +0100
Subject: [PATCH] Recive data as 3 integers (x,y,z) rather than AccelData
 structure.

---
 app/src/main/assets/pebble_sd.pbw             | Bin 53285 -> 52936 bytes
 .../SdDataSourcePebble.java                   |  20 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/src/main/assets/pebble_sd.pbw b/app/src/main/assets/pebble_sd.pbw
index b4679f91b3b0f6d5b88e98ea8a6743b2aa0a1407..f56bfa245cf23b0d26f593bc70585f543062c966 100644
GIT binary patch
delta 8579
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

delta 8894
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
DErT3p

diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
index 0a9d53b..cf614e8 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
@@ -406,15 +406,29 @@ public class SdDataSourcePebble extends SdDataSource {
                     numSamples = data.getUnsignedIntegerAsLong(KEY_NUM_RAW_DATA);
                     Log.v(TAG, "numSamples = " + numSamples);
                     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) {
-                            rawData[nRawData] = reading.getMagnitude();
-                            nRawData++;
+                            rawData[nRawData] = (int)Math.sqrt(x*x+y*y+z*z);
                         } else {
                             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");
+                    //    }
+                   // }
+
                 }
             }
         };