From 70f251dff69de0b2e80fa03cff4ca2fee05e25d4 Mon Sep 17 00:00:00 2001 From: Graham Jones Date: Sun, 3 Jul 2016 20:24:42 +0100 Subject: [PATCH] Added settings for watch debug mode and to switch the spectrum display on the watch off to save processor power. --- app/src/main/assets/pebble_sd.pbw | Bin 52936 -> 54845 bytes .../SdDataSourcePebble.java | 27 +++++++--- .../res/values/pebble_datasource_values.xml | 46 ++++++++++++++++++ .../res/values/pebble_sample_freq_list.xml | 16 ------ .../main/res/values/pebble_sd_mode_list.xml | 14 ------ .../main/res/xml/pebble_datasource_prefs.xml | 17 +++++++ 6 files changed, 84 insertions(+), 36 deletions(-) create mode 100644 app/src/main/res/values/pebble_datasource_values.xml delete mode 100644 app/src/main/res/values/pebble_sample_freq_list.xml delete mode 100644 app/src/main/res/values/pebble_sd_mode_list.xml diff --git a/app/src/main/assets/pebble_sd.pbw b/app/src/main/assets/pebble_sd.pbw index f56bfa245cf23b0d26f593bc70585f543062c966..f00cad9e42a05f35e1e978f9b6c1ff139433de24 100644 GIT binary patch literal 54845 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 Q4aI-O_-e|LQ#AK~042hVj{pDw literal 52936 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 diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java index cf614e8..120f851 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java @@ -113,6 +113,8 @@ public class SdDataSourcePebble extends SdDataSource { private int KEY_SAMPLE_FREQ = 29; private int KEY_RAW_DATA = 30; private int KEY_NUM_RAW_DATA = 31; + private int KEY_DEBUG = 32; + private int KEY_DISPLAY_SPECTRUM = 33; // Values of the KEY_DATA_TYPE entry in a message private int DATA_TYPE_RESULTS = 1; // Analysis Results @@ -125,6 +127,8 @@ public class SdDataSourcePebble extends SdDataSource { private int SD_MODE_RAW = 1; // Send raw, unprocessed data to the phone. private int SD_MODE_FILTER = 2; // Use digital filter rather than FFT. + private short mDebug; + private short mDisplaySpectrum; private short mDataUpdatePeriod; private short mMutePeriod; private short mManAlarmPeriod; @@ -265,6 +269,14 @@ public class SdDataSourcePebble extends SdDataSource { // Watch Settings String prefStr; + prefStr = SP.getString("PebbleDebug", "SET_FROM_XML"); + mDebug = (short) Integer.parseInt(prefStr); + Log.v(TAG, "updatePrefs() Debug = " + mDebug); + + prefStr = SP.getString("PebbleDisplaySpectrum", "SET_FROM_XML"); + mDisplaySpectrum = (short) Integer.parseInt(prefStr); + Log.v(TAG, "updatePrefs() DisplaySpectrum = " + mDisplaySpectrum); + prefStr = SP.getString("PebbleUpdatePeriod", "SET_FROM_XML"); mDataUpdatePeriod = (short) Integer.parseInt(prefStr); Log.v(TAG, "updatePrefs() DataUpdatePeriod = " + mDataUpdatePeriod); @@ -406,13 +418,14 @@ 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 (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); + for (int i = 0; i < rawDataBytes.length - 4; i += 4) { // 4 bytes per sample + int x = (rawDataBytes[i]); + //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); + Log.v(TAG,"x="+x); if (nRawData < MAX_RAW_DATA) { - rawData[nRawData] = (int)Math.sqrt(x*x+y*y+z*z); + rawData[nRawData] = (int)Math.sqrt(x); } else { Log.i(TAG, "WARNING - rawData Buffer Full"); } @@ -495,6 +508,8 @@ public class SdDataSourcePebble extends SdDataSource { Log.v(TAG, "sendPebblSdSettings() - preparing settings dictionary.. mSampleFreq=" + mSampleFreq); // Watch Settings final PebbleDictionary setDict = new PebbleDictionary(); + setDict.addInt16(KEY_DEBUG, mDebug); + setDict.addInt16(KEY_DISPLAY_SPECTRUM, mDisplaySpectrum); setDict.addInt16(KEY_DATA_UPDATE_PERIOD, mDataUpdatePeriod); setDict.addInt16(KEY_MUTE_PERIOD, mMutePeriod); setDict.addInt16(KEY_MAN_ALARM_PERIOD, mManAlarmPeriod); diff --git a/app/src/main/res/values/pebble_datasource_values.xml b/app/src/main/res/values/pebble_datasource_values.xml new file mode 100644 index 0000000..5127299 --- /dev/null +++ b/app/src/main/res/values/pebble_datasource_values.xml @@ -0,0 +1,46 @@ + + + + + "Debug OFF" + "Debug ON" + + + "0" + "1" + + + + "Spectrum Display OFF" + "Spectrum Display ON" + + + "0" + "1" + + + + "Normal - OpenSeizureDetector FFT" + "Raw" + "Digital Filter" + + + "0" + "1" + "2" + + + + "100 Hz" + "50 Hz" + "25 Hz" + "10 Hz" + + + "100" + "50" + "25" + "10" + + + \ No newline at end of file diff --git a/app/src/main/res/values/pebble_sample_freq_list.xml b/app/src/main/res/values/pebble_sample_freq_list.xml deleted file mode 100644 index 7ffcea3..0000000 --- a/app/src/main/res/values/pebble_sample_freq_list.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - "100 Hz" - "50 Hz" - "25 Hz" - "10 Hz" - - - "100" - "50" - "25" - "10" - - - \ No newline at end of file diff --git a/app/src/main/res/values/pebble_sd_mode_list.xml b/app/src/main/res/values/pebble_sd_mode_list.xml deleted file mode 100644 index 130121d..0000000 --- a/app/src/main/res/values/pebble_sd_mode_list.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - "Normal - OpenSeizureDetector FFT" - "Raw" - "Digital Filter" - - - "0" - "1" - "2" - - - \ No newline at end of file diff --git a/app/src/main/res/xml/pebble_datasource_prefs.xml b/app/src/main/res/xml/pebble_datasource_prefs.xml index 710fcf2..9d5ea5f 100644 --- a/app/src/main/res/xml/pebble_datasource_prefs.xml +++ b/app/src/main/res/xml/pebble_datasource_prefs.xml @@ -1,4 +1,5 @@ + @@ -19,6 +20,22 @@ android:title="Manual Alarm Period (sec)" /> + +