diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java
index 700a96d..1b4b6e0 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSource.java
@@ -23,6 +23,7 @@
 */
 package uk.org.openseizuredetector;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -773,4 +774,18 @@ public abstract class SdDataSource {
     }
 
 
+
+    public class SdDataBroadcastReceiver extends BroadcastReceiver {
+        //private String TAG = "SdDataBroadcastReceiver";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG,"SdDataBroadcastReceiver.onReceive()");
+            String jsonStr = intent.getStringExtra("data");
+            Log.v(TAG,"SdDataBroadcastReceiver.onReceive() - data="+jsonStr);
+            updateFromJSON(jsonStr);
+        }
+    }
+
+
 }
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
index 0d3f695..7a07a13 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
@@ -71,12 +71,7 @@ public class SdDataSourceBLE extends SdDataSource {
     public void start() {
         Log.i(TAG, "start()");
         mUtil.writeToSysLogFile("SdDataSourceBLE.start()");
-
-        mSdDataBroadcastReceiver = new SdDataBroadcastReceiver();
-        //uk.org.openseizuredetector.SdDataReceived
-        IntentFilter filter = new IntentFilter("uk.org.openseizuredetector.SdDataReceived");
-        mContext.registerReceiver(mSdDataBroadcastReceiver, filter);
-
+        super.start();
     }
 
     /**
@@ -85,7 +80,7 @@ public class SdDataSourceBLE extends SdDataSource {
     public void stop() {
         Log.i(TAG, "stop()");
         mUtil.writeToSysLogFile("SDDataSourceBLE.stop()");
-        mContext.unregisterReceiver(mSdDataBroadcastReceiver);
+        super.stop();
     }
 
 
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java
index 0199691..7dbf47d 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java
@@ -53,52 +53,8 @@ import static java.lang.Long.parseLong;
  * SdWebServer expects POST requests to /data and /settings URLs to send data or watch settings.
  */
 public class SdDataSourceGarmin extends SdDataSource {
-    private Handler mHandler = new Handler();
-    private Timer mStatusTimer;
-    private Timer mSettingsTimer;
-    private Timer mFaultCheckTimer;
-    private Time mDataStatusTime;
-    private boolean mWatchAppRunningCheck = false;
-    private int mAppRestartTimeout = 10;  // Timeout before re-starting watch app (sec) if we have not received
-                                            // data after mDataUpdatePeriod
-    private int mFaultTimerPeriod = 30;  // Fault Timer Period in sec
-    private int mSettingsPeriod = 60;  // period between requesting settings in seconds.
-    private SdDataBroadcastReceiver mSdDataBroadcastReceiver;
-
-
     private String TAG = "SdDataSourceGarmin";
 
-    // Values for SD_MODE
-    private int SD_MODE_FFT = 0;     // The original OpenSeizureDetector mode (FFT based)
-    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 int SIMPLE_SPEC_FMAX = 10;
-
-    private int ACCEL_SCALE_FACTOR = 1000;  // Amount by which to reduce analysis results to scale to be comparable to analysis on Pebble.
-
-    private short mDebug;
-    private short mFreqCutoff = 12;
-    private short mDisplaySpectrum;
-    private short mDataUpdatePeriod;
-    private short mMutePeriod;
-    private short mManAlarmPeriod;
-    private short mPebbleSdMode;
-    private short mSampleFreq;
-    private short mAlarmFreqMin;
-    private short mAlarmFreqMax;
-    private short mSamplePeriod;
-    private short mWarnTime;
-    private short mAlarmTime;
-    private short mAlarmThresh;
-    private short mAlarmRatioThresh;
-    private boolean mFallActive;
-    private short mFallThreshMin;
-    private short mFallThreshMax;
-    private short mFallWindow;
-    private int mMute;  // !=0 means muted by keypress on watch.
-
-    private int mAlarmCount;
-
     public SdDataSourceGarmin(Context context, Handler handler,
                               SdDataReceiver sdDataReceiver) {
         super(context, handler, sdDataReceiver);
@@ -116,60 +72,7 @@ public class SdDataSourceGarmin extends SdDataSource {
     public void start() {
         Log.i(TAG, "start()");
         mUtil.writeToSysLogFile("SdDataSourceGarmin.start()");
-        updatePrefs();
-        // Start timer to check status of watch regularly.
-        mDataStatusTime = new Time(Time.getCurrentTimezone());
-        // use a timer to check the status of the pebble app on the same frequency
-        // as we get app data.
-        if (mStatusTimer == null) {
-            Log.v(TAG, "start(): starting status timer");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.start() - starting status timer");
-            mStatusTimer = new Timer();
-            mStatusTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    getStatus();
-                }
-            }, 0, mDataUpdatePeriod * 1000);
-        } else {
-            Log.v(TAG, "start(): status timer already running.");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.start() - status timer already running??");
-        }
-        if (mFaultCheckTimer == null) {
-            Log.v(TAG, "start(): starting alarm check timer");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.start() - starting alarm check timer");
-            mFaultCheckTimer = new Timer();
-            mFaultCheckTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    faultCheck();
-                }
-            }, 0, 1000);
-        } else {
-            Log.v(TAG, "start(): alarm check timer already running.");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.start() - alarm check timer already running??");
-        }
-
-        if (mSettingsTimer == null) {
-            Log.v(TAG, "start(): starting settings timer");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.start() - starting settings timer");
-            mSettingsTimer = new Timer();
-            mSettingsTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    mSdData.haveSettings = false;
-                }
-            }, 0, 1000 * mSettingsPeriod);  // ask for settings less frequently than we get data
-        } else {
-            Log.v(TAG, "start(): settings timer already running.");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.start() - settings timer already running??");
-        }
-
-        mSdDataBroadcastReceiver = new SdDataBroadcastReceiver();
-        //uk.org.openseizuredetector.SdDataReceived
-        IntentFilter filter = new IntentFilter("uk.org.openseizuredetector.SdDataReceived");
-        mContext.registerReceiver(mSdDataBroadcastReceiver, filter);
-
+        super.start();
     }
 
     /**
@@ -178,580 +81,8 @@ public class SdDataSourceGarmin extends SdDataSource {
     public void stop() {
         Log.i(TAG, "stop()");
         mUtil.writeToSysLogFile("SdDataSourceGarmin.stop()");
-        try {
-            // Stop the status timer
-            if (mStatusTimer != null) {
-                Log.v(TAG, "stop(): cancelling status timer");
-                mUtil.writeToSysLogFile("SdDataSourceGarmin.stop() - cancelling status timer");
-                mStatusTimer.cancel();
-                mStatusTimer.purge();
-                mStatusTimer = null;
-            }
-            // Stop the settings timer
-            if (mSettingsTimer != null) {
-                Log.v(TAG, "stop(): cancelling settings timer");
-                mUtil.writeToSysLogFile("SdDataSourceGarmin.stop() - cancelling settings timer");
-                mSettingsTimer.cancel();
-                mSettingsTimer.purge();
-                mSettingsTimer = null;
-            }
-            // Stop the alarm check timer
-            if (mFaultCheckTimer != null) {
-                Log.v(TAG, "stop(): cancelling alarm check timer");
-                mUtil.writeToSysLogFile("SdDataSourceGarmin.stop() - cancelling alarm check timer");
-                mFaultCheckTimer.cancel();
-                mFaultCheckTimer.purge();
-                mFaultCheckTimer = null;
-            }
-
-        } catch (Exception e) {
-            Log.v(TAG, "Error in stop() - " + e.toString());
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.stop() - error - "+e.toString());
-        }
-        mContext.unregisterReceiver(mSdDataBroadcastReceiver);
+        super.stop();
     }
-
-    /**
-     * updatePrefs() - update basic settings from the SharedPreferences
-     * - defined in res/xml/SdDataSourceNetworkPassivePrefs.xml
-     */
-    public void updatePrefs() {
-        Log.v(TAG, "updatePrefs()");
-        mUtil.writeToSysLogFile("SdDataSourceGarmin.updatePrefs()");
-        SharedPreferences SP = PreferenceManager
-                .getDefaultSharedPreferences(mContext);
-        try {
-            // Parse the AppRestartTimeout period setting.
-            try {
-                String appRestartTimeoutStr = SP.getString("AppRestartTimeout", "10");
-                mAppRestartTimeout = Integer.parseInt(appRestartTimeoutStr);
-                Log.v(TAG, "updatePrefs() - mAppRestartTimeout = " + mAppRestartTimeout);
-            } catch (Exception ex) {
-                Log.v(TAG, "updatePrefs() - Problem with AppRestartTimeout preference!");
-                Toast toast = Toast.makeText(mContext, "Problem Parsing AppRestartTimeout Preference", Toast.LENGTH_SHORT);
-                toast.show();
-            }
-
-            // Parse the FaultTimer period setting.
-            try {
-                String faultTimerPeriodStr = SP.getString("FaultTimerPeriod", "30");
-                mFaultTimerPeriod = Integer.parseInt(faultTimerPeriodStr);
-                Log.v(TAG, "updatePrefs() - mFaultTimerPeriod = " + mFaultTimerPeriod);
-            } catch (Exception ex) {
-                Log.v(TAG, "updatePrefs() - Problem with FaultTimerPeriod preference!");
-                Toast toast = Toast.makeText(mContext, "Problem Parsing FaultTimerPeriod Preference", Toast.LENGTH_SHORT);
-                toast.show();
-            }
-
-
-            // Watch Settings
-            String prefStr;
-
-            prefStr = SP.getString("PebbleDebug", "SET_FROM_XML");
-            if (prefStr != null) {
-                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);
-
-                prefStr = SP.getString("MutePeriod", "SET_FROM_XML");
-                mMutePeriod = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() MutePeriod = " + mMutePeriod);
-
-                prefStr = SP.getString("ManAlarmPeriod", "SET_FROM_XML");
-                mManAlarmPeriod = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() ManAlarmPeriod = " + mManAlarmPeriod);
-
-                prefStr = SP.getString("PebbleSdMode", "SET_FROM_XML");
-                mPebbleSdMode = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() PebbleSdMode = " + mPebbleSdMode);
-
-                prefStr = SP.getString("SampleFreq", "SET_FROM_XML");
-                mSampleFreq = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() SampleFreq = " + mSampleFreq);
-
-                prefStr = SP.getString("SamplePeriod", "SET_FROM_XML");
-                mSamplePeriod = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() AnalysisPeriod = " + mSamplePeriod);
-
-                prefStr = SP.getString("AlarmFreqMin", "SET_FROM_XML");
-                mAlarmFreqMin = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() AlarmFreqMin = " + mAlarmFreqMin);
-
-                prefStr = SP.getString("AlarmFreqMax", "SET_FROM_XML");
-                mAlarmFreqMax = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() AlarmFreqMax = " + mAlarmFreqMax);
-
-                prefStr = SP.getString("WarnTime", "SET_FROM_XML");
-                mWarnTime = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() WarnTime = " + mWarnTime);
-
-                prefStr = SP.getString("AlarmTime", "SET_FROM_XML");
-                mAlarmTime = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() AlarmTime = " + mAlarmTime);
-
-                prefStr = SP.getString("AlarmThresh", "SET_FROM_XML");
-                mAlarmThresh = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() AlarmThresh = " + mAlarmThresh);
-
-                prefStr = SP.getString("AlarmRatioThresh", "SET_FROM_XML");
-                mAlarmRatioThresh = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() AlarmRatioThresh = " + mAlarmRatioThresh);
-
-                mFallActive = SP.getBoolean("FallActive", false);
-                Log.v(TAG, "updatePrefs() FallActive = " + mFallActive);
-
-                prefStr = SP.getString("FallThreshMin", "SET_FROM_XML");
-                mFallThreshMin = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() FallThreshMin = " + mFallThreshMin);
-
-                prefStr = SP.getString("FallThreshMax", "SET_FROM_XML");
-                mFallThreshMax = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() FallThreshMax = " + mFallThreshMax);
-
-                prefStr = SP.getString("FallWindow", "SET_FROM_XML");
-                mFallWindow = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() FallWindow = " + mFallWindow);
-
-                mSdData.mHRAlarmActive = SP.getBoolean("HRAlarmActive", false);
-                Log.v(TAG, "updatePrefs() HRAlarmActive = " + mSdData.mHRAlarmActive);
-
-                mSdData.mHRNullAsAlarm = SP.getBoolean("HRNullAsAlarm", false);
-                Log.v(TAG, "updatePrefs() HRNullAsAlarm = " + mSdData.mHRNullAsAlarm);
-
-                prefStr = SP.getString("HRThreshMin", "SET_FROM_XML");
-                mSdData.mHRThreshMin = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() HRThreshMin = " + mSdData.mHRThreshMin);
-
-                prefStr = SP.getString("HRThreshMax", "SET_FROM_XML");
-                mSdData.mHRThreshMax = (short) Integer.parseInt(prefStr);
-                Log.v(TAG, "updatePrefs() HRThreshMax = " + mSdData.mHRThreshMax);
-
-            } else {
-                Log.v(TAG, "updatePrefs() - prefStr is null - WHY????");
-                mUtil.writeToSysLogFile("SdDataSourceGarmin.updatePrefs() - prefStr is null - WHY??");
-                Toast toast = Toast.makeText(mContext, "Problem Parsing Preferences - Something won't work - Please go back to Settings and correct it!", Toast.LENGTH_SHORT);
-                toast.show();
-            }
-
-        } catch (Exception ex) {
-            Log.v(TAG, "updatePrefs() - Problem parsing preferences!");
-            mUtil.writeToSysLogFile("SdDataSourceGarmin.updatePrefs() - ERROR "+ex.toString());
-            Toast toast = Toast.makeText(mContext, "Problem Parsing Preferences - Something won't work - Please go back to Settings and correct it!", Toast.LENGTH_SHORT);
-            toast.show();
-        }
-    }
-
-
-    // Force the data stored in this datasource to update in line with the JSON string encoded data provided.
-    // Used by webServer to update the GarminDatasource.
-    // Returns a message string that is passed back to the watch.
-    public String updateFromJSON(String jsonStr) {
-        String retVal = "undefined";
-        String watchPartNo;
-        String watchFwVersion;
-        String sdVersion;
-        String sdName;
-        Log.v(TAG,"updateFromJSON - "+jsonStr);
-
-        try {
-            JSONObject mainObject = new JSONObject(jsonStr);
-            //JSONObject dataObject = mainObject.getJSONObject("dataObj");
-            JSONObject dataObject = mainObject;
-            String dataTypeStr = dataObject.getString("dataType");
-            Log.v(TAG,"updateFromJSON - dataType="+dataTypeStr);
-            if (dataTypeStr.equals("raw")) {
-                Log.v(TAG,"updateFromJSON - processing raw data");
-                try {
-                    mSdData.mHR = dataObject.getDouble("HR");
-                } catch (JSONException e) {
-                    // if we get 'null' HR (For example if the heart rate is not working)
-                    mSdData.mHR = -1;
-                }
-                try {
-                    mMute = dataObject.getInt("Mute");
-                } catch (JSONException e) {
-                    // if we get 'null' HR (For example if the heart rate is not working)
-                    mMute = 0;
-                }
-                JSONArray accelVals = dataObject.getJSONArray("data");
-                Log.v(TAG, "Received " + accelVals.length() + " acceleration values");
-                int i;
-                for (i = 0; i < accelVals.length(); i++) {
-                    mSdData.rawData[i] = accelVals.getInt(i);
-                }
-                mSdData.mNsamp = accelVals.length();
-                //mNSamp = accelVals.length();
-                mWatchAppRunningCheck = true;
-                doAnalysis();
-                if (mSdData.haveSettings == false) {
-                    retVal = "sendSettings";
-                } else {
-                    retVal = "OK";
-                }
-            } else if (dataTypeStr.equals("settings")){
-                Log.v(TAG,"updateFromJSON - processing settings");
-                mSamplePeriod = (short)dataObject.getInt("analysisPeriod");
-                mSampleFreq = (short)dataObject.getInt("sampleFreq");
-                mSdData.batteryPc = (short)dataObject.getInt("battery");
-                Log.v(TAG,"updateFromJSON - mSamplePeriod="+mSamplePeriod+" mSampleFreq="+mSampleFreq);
-                mUtil.writeToSysLogFile("SdDataSourceGarmin.updateFromJSON - Settings Received");
-                mUtil.writeToSysLogFile("    * mSamplePeriod="+mSamplePeriod+" mSampleFreq="+mSampleFreq);
-                mUtil.writeToSysLogFile("    * batteryPc = "+mSdData.batteryPc);
-
-                try {
-                    watchPartNo = dataObject.getString("watchPartNo");
-                    watchFwVersion = dataObject.getString("watchFwVersion");
-                    sdVersion = dataObject.getString("sdVersion");
-                    sdName = dataObject.getString("sdName");
-                    mUtil.writeToSysLogFile("    * sdName = "+sdName+" version "+sdVersion);
-                    mUtil.writeToSysLogFile("    * watchPartNo = "+watchPartNo+" fwVersion "+watchFwVersion);
-                } catch (Exception e) {
-                    Log.e(TAG,"updateFromJSON - Error Parsing V3.2 JSON String - "+e.toString());
-                    mUtil.writeToSysLogFile("updateFromJSON - Error Parsing V3.2 JSON String - "+e.toString());
-                    mUtil.writeToSysLogFile("          This is probably because of an out of date watch app - please upgrade!");
-                    e.printStackTrace();
-                }
-                mSdData.haveSettings = true;
-                mSdData.mSampleFreq = mSampleFreq;
-                mWatchAppRunningCheck = true;
-                retVal = "OK";
-            } else {
-                Log.e(TAG,"updateFromJSON - unrecognised dataType "+dataTypeStr);
-                retVal = "ERROR";
-            }
-        } catch (Exception e) {
-            Log.e(TAG,"updateFromJSON - Error Parsing JSON String - "+e.toString());
-            mUtil.writeToSysLogFile("updateFromJSON - Error Parsing JSON String - "+e.toString());
-            e.printStackTrace();
-            retVal = "ERROR";
-        }
-        return(retVal);
-    }
-
-    /**
-     * Calculate the magnitude of entry i in the fft array fft
-     * @param fft
-     * @param i
-     * @return magnitude ( Re*Re + Im*Im )
-     */
-    private double getMagnitude(double[] fft, int i) {
-        double mag;
-        mag = (fft[2*i]*fft[2*i] + fft[2*i + 1] * fft[2*i +1]);
-        return mag;
-    }
-
-    /**
-     * doAnalysis() - analyse the data if the accelerometer data array mAccData
-     * and populate the output data structure mSdData
-     */
-    private void doAnalysis() {
-        // FIXME - Use specified sampleFreq, not this hard coded one
-        mSampleFreq = 25;
-        double freqRes = 1.0*mSampleFreq/mSdData.mNsamp;
-        Log.v(TAG,"doAnalysis(): mSampleFreq="+mSampleFreq+" mNSamp="+mSdData.mNsamp+": freqRes="+freqRes);
-        // Set the frequency bounds for the analysis in fft output bin numbers.
-        int nMin = (int)(mAlarmFreqMin/freqRes);
-        int nMax = (int)(mAlarmFreqMax /freqRes);
-        Log.v(TAG,"doAnalysis(): mAlarmFreqMin="+mAlarmFreqMin+", nMin="+nMin
-                +", mAlarmFreqMax="+mAlarmFreqMax+", nMax="+nMax);
-        // Calculate the bin number of the cutoff frequency
-        int nFreqCutoff = (int)(mFreqCutoff /freqRes);
-        Log.v(TAG,"mFreqCutoff = "+mFreqCutoff+", nFreqCutoff="+nFreqCutoff);
-
-        DoubleFFT_1D fftDo = new DoubleFFT_1D(mSdData.mNsamp);
-        double[] fft = new double[mSdData.mNsamp * 2];
-        ///System.arraycopy(mAccData, 0, fft, 0, mNsamp);
-        System.arraycopy(mSdData.rawData, 0, fft, 0, mSdData.mNsamp);
-        fftDo.realForward(fft);
-
-        // Calculate the whole spectrum power (well a value equivalent to it that avoids square root calculations
-        // and zero any readings that are above the frequency cutoff.
-        double specPower = 0;
-        for (int i = 1; i < mSdData.mNsamp / 2; i++) {
-            if (i <= nFreqCutoff) {
-                specPower = specPower + getMagnitude(fft,i);
-            } else {
-                fft[2*i] = 0.;
-                fft[2*i+1] = 0.;
-            }
-        }
-        //Log.v(TAG,"specPower = "+specPower);
-        //specPower = specPower/(mSdData.mNsamp/2);
-        specPower = specPower/mSdData.mNsamp/2;
-        //Log.v(TAG,"specPower = "+specPower);
-
-        // Calculate the Region of Interest power and power ratio.
-        double roiPower = 0;
-        for (int i=nMin;i<nMax;i++) {
-            roiPower = roiPower + getMagnitude(fft,i);
-        }
-        roiPower = roiPower/(nMax - nMin);
-        double roiRatio = 10 * roiPower / specPower;
-
-        // Calculate the simplified spectrum - power in 1Hz bins.
-        double[] simpleSpec = new double[SIMPLE_SPEC_FMAX+1];
-        for (int ifreq=0;ifreq<SIMPLE_SPEC_FMAX;ifreq++) {
-            int binMin = (int)(1 + ifreq/freqRes);    // add 1 to loose dc component
-            int binMax = (int)(1 + (ifreq+1)/freqRes);
-            simpleSpec[ifreq]=0;
-            for (int i=binMin;i<binMax;i++) {
-                simpleSpec[ifreq] = simpleSpec[ifreq] + getMagnitude(fft,i);
-            }
-            simpleSpec[ifreq] = simpleSpec[ifreq] / (binMax-binMin);
-        }
-
-        // Populate the mSdData structure to communicate with the main SdServer service.
-        mDataStatusTime.setToNow();
-        mSdData.specPower = (long)specPower / ACCEL_SCALE_FACTOR;
-        mSdData.roiPower = (long)roiPower / ACCEL_SCALE_FACTOR;
-        mSdData.dataTime.setToNow();
-        mSdData.maxVal = 0;   // not used
-        mSdData.maxFreq = 0;  // not used
-        mSdData.haveData = true;
-        mSdData.alarmThresh = mAlarmThresh;
-        mSdData.alarmRatioThresh = mAlarmRatioThresh;
-        mSdData.alarmFreqMin = mAlarmFreqMin;
-        mSdData.alarmFreqMax = mAlarmFreqMax;
-        // note mSdData.batteryPc is set from settings data in updateFromJSON()
-        // FIXME - I haven't worked out why dividing by 1000 seems necessary to get the graph on scale - we don't seem to do that with the Pebble.
-        for(int i=0;i<SIMPLE_SPEC_FMAX;i++) {
-            mSdData.simpleSpec[i] = (int)simpleSpec[i]/ACCEL_SCALE_FACTOR;
-        }
-        Log.v(TAG, "simpleSpec = " + Arrays.toString(mSdData.simpleSpec));
-
-        // Because we have received data, set flag to show watch app running.
-        mWatchAppRunningCheck = true;
-
-        // Check this data to see if it represents an alarm state.
-        alarmCheck();
-        hrCheck();
-        fallCheck();
-        muteCheck();
-
-        mSdDataReceiver.onSdDataReceived(mSdData);  // and tell SdServer we have received data.
-    }
-
-
-    /****************************************************************
-     * checkAlarm() - checks the current accelerometer data and uses
-     * historical data to determine if we are in a fault, warning or ok
-     * state.
-     * Sets mSdData.alarmState and mSdData.hrAlarmStanding
-     */
-    private void alarmCheck() {
-        boolean inAlarm;
-        Log.v(TAG, "alarmCheck()");
-        // Is the current set of data representing an alarm state?
-        if ((mSdData.roiPower > mAlarmThresh) && (10 * (mSdData.roiPower / mSdData.specPower) > mAlarmRatioThresh)) {
-            inAlarm = true;
-        } else {
-            inAlarm = false;
-        }
-
-        // set the alarmState to Alarm, Warning or OK, depending on the current state and previous ones.
-        if (inAlarm) {
-            mAlarmCount += mSamplePeriod;
-            if (mAlarmCount > mAlarmTime) {
-                // full alarm
-                mSdData.alarmState = 2;
-            } else if (mAlarmCount > mWarnTime) {
-                // warning
-                mSdData.alarmState = 1;
-            }
-        } else {
-            // If we are not in an ALARM state, revert back to WARNING, otherwise
-            // revert back to OK.
-            if (mSdData.alarmState == 2) {
-                // revert to warning
-                mSdData.alarmState = 1;
-                mAlarmCount = mWarnTime + 1;  // pretend we have only just entered warning state.
-            } else {
-                // revert to OK
-                mSdData.alarmState = 0;
-                mAlarmCount = 0;
-            }
-        }
-
-        Log.v(TAG, "alarmCheck(): inAlarm=" + inAlarm + ", alarmState = " + mSdData.alarmState + " alarmCount=" + mAlarmCount + " mAlarmTime=" + mAlarmTime);
-
-    }
-
-    public void muteCheck() {
-        if (mMute != 0) {
-            Log.v(TAG, "Mute Active - setting alarms to mute");
-            mSdData.alarmState = 6;
-            mSdData.alarmPhrase = "MUTE";
-            mSdData.mHRAlarmStanding = false;
-        }
-
-    }
-
-    /**
-     * hrCheck - check the Heart rate data in mSdData to see if it represents an alarm condition.
-     * Sets mSdData.mHRAlarmStanding
-     */
-    public void hrCheck() {
-        Log.v(TAG, "hrCheck()");
-        /* Check Heart Rate against alarm settings */
-        if (mSdData.mHRAlarmActive) {
-            if (mSdData.mHR < 0) {
-                if (mSdData.mHRNullAsAlarm) {
-                    Log.i(TAG, "Heart Rate Null - Alarming");
-                    mSdData.mHRFaultStanding = false;
-                    mSdData.mHRAlarmStanding = true;
-                } else {
-                    Log.i(TAG, "Heart Rate Fault (HR<0)");
-                    mSdData.mHRFaultStanding = true;
-                    mSdData.mHRAlarmStanding = false;
-                }
-            }
-            else if ((mSdData.mHR > mSdData.mHRThreshMax) || (mSdData.mHR < mSdData.mHRThreshMin)) {
-                Log.i(TAG, "Heart Rate Abnormal - " + mSdData.mHR + " bpm");
-                mSdData.mHRFaultStanding = false;
-                mSdData.mHRAlarmStanding = true;
-            }
-            else {
-                mSdData.mHRFaultStanding = false;
-                mSdData.mHRAlarmStanding = false;
-            }
-        }
-
-    }
-
-    /****************************************************************
-     * Simple threshold analysis to chech for fall.
-     * Called from clock_tick_handler()
-     */
-    public void fallCheck() {
-        int i,j;
-        double minAcc, maxAcc;
-
-        long fallWindowSamp = (mFallWindow*mSdData.mSampleFreq)/1000; // Convert ms to samples.
-        Log.v(TAG, "check_fall() - fallWindowSamp=" +fallWindowSamp);
-        // Move window through sample buffer, checking for fall.
-        // Note - not resetting fallAlarmStanding means that fall alarms will always latch until the 'Accept Alarm' button
-        // is pressed.
-        //mSdData.fallAlarmStanding = false;
-        if (mFallActive) {
-            mSdData.mFallActive = true;
-            for (i = 0; i < mSdData.mNsamp - fallWindowSamp; i++) {  // i = window start point
-                // Find max and min acceleration within window.
-                minAcc = mSdData.rawData[i];
-                maxAcc = mSdData.rawData[i];
-                for (j = 0; j < fallWindowSamp; j++) {  // j = position within window
-                    if (mSdData.rawData[i + j] < minAcc) minAcc = mSdData.rawData[i + j];
-                    if (mSdData.rawData[i + j] > maxAcc) maxAcc = mSdData.rawData[i + j];
-                }
-                if ((minAcc < mFallThreshMin) && (maxAcc > mFallThreshMax)) {
-                    Log.d(TAG, "check_fall() - minAcc=" + minAcc + ", maxAcc=" + maxAcc);
-                    Log.d(TAG, "check_fall() - ****FALL DETECTED****");
-                    mSdData.fallAlarmStanding = true;
-                    return;
-                }
-                if (mMute != 0) {
-                    Log.v(TAG,"Mute Active - setting fall alarm to mute");
-                    mSdData.fallAlarmStanding = false;
-                }
-            }
-        } else {
-            mSdData.mFallActive = false;
-            Log.v(TAG,"check_fall - mFallActive is false - doing nothing");
-        }
-        //if (debug) APP_LOG(APP_LOG_LEVEL_DEBUG,"check_fall() - minAcc=%d, maxAcc=%d",
-        //	  minAcc,maxAcc);
-
-    }
-
-
-
-    /**
-     * Checks the status of the connection to the watch,
-     * and sets class variables for use by other functions.
-     */
-    public void getStatus() {
-        Time tnow = new Time(Time.getCurrentTimezone());
-        long tdiff;
-        tnow.setToNow();
-        // get time since the last data was received from the Pebble watch.
-        tdiff = (tnow.toMillis(false) - mDataStatusTime.toMillis(false));
-        Log.v(TAG, "getStatus() - mWatchAppRunningCheck=" + mWatchAppRunningCheck + " tdiff=" + tdiff);
-        Log.v(TAG,"getStatus() - tdiff="+tdiff+", mDataUpatePeriod="+mDataUpdatePeriod+", mAppRestartTimeout="+mAppRestartTimeout);
-
-        mSdData.watchConnected = true;  // We can't check connection for passive network connection, so set it to true to avoid errors.
-        // And is the watch app running?
-        // set mWatchAppRunningCheck has been false for more than 10 seconds
-        // the app is not talking to us
-        // mWatchAppRunningCheck is set to true in the receiveData handler.
-        if (!mWatchAppRunningCheck &&
-                (tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) {
-            Log.v(TAG, "getStatus() - tdiff = " + tdiff);
-            mSdData.watchAppRunning = false;
-            // Only make audible warning beep if we have not received data for more than mFaultTimerPeriod seconds.
-            if (tdiff > (mDataUpdatePeriod + mFaultTimerPeriod) * 1000) {
-                Log.v(TAG, "getStatus() - Watch App Not Running");
-                mUtil.writeToSysLogFile("SdDataSourceGarmin.getStatus() - Watch App not Running");
-                //mDataStatusTime.setToNow();
-                mSdData.roiPower = -1;
-                mSdData.specPower = -1;
-                mSdDataReceiver.onSdDataFault(mSdData);
-            } else {
-                Log.v(TAG, "getStatus() - Waiting for mFaultTimerPeriod before issuing audible warning...");
-            }
-        } else {
-            mSdData.watchAppRunning = true;
-        }
-
-        // if we have confirmation that the app is running, reset the
-        // status time to now and initiate another check.
-        if (mWatchAppRunningCheck) {
-            mWatchAppRunningCheck = false;
-            mDataStatusTime.setToNow();
-        }
-
-        if (!mSdData.haveSettings) {
-            Log.v(TAG, "getStatus() - no settings received yet");
-        }
-    }
-
-    /**
-     * faultCheck - determines alarm state based on seizure detector data SdData.   Called every second.
-     */
-    private void faultCheck() {
-        Time tnow = new Time(Time.getCurrentTimezone());
-        long tdiff;
-        tnow.setToNow();
-
-        // get time since the last data was received from the watch.
-        tdiff = (tnow.toMillis(false) - mDataStatusTime.toMillis(false));
-        Log.v(TAG, "faultCheck() - tdiff=" + tdiff + ", mDataUpatePeriod=" + mDataUpdatePeriod + ", mAppRestartTimeout=" + mAppRestartTimeout
-                + ", combined = " + (mDataUpdatePeriod + mAppRestartTimeout) * 1000);
-        if (!mWatchAppRunningCheck &&
-                (tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) {
-            Log.v(TAG, "faultCheck() - watch app not running so not doing anything");
-            mAlarmCount = 0;
-        }
-    }
-
-
-    public class SdDataBroadcastReceiver extends BroadcastReceiver {
-        //private String TAG = "SdDataBroadcastReceiver";
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            Log.v(TAG,"SdDataBroadcastReceiver.onReceive()");
-            String jsonStr = intent.getStringExtra("data");
-            Log.v(TAG,"SdDataBroadcastReceiver.onReceive() - data="+jsonStr);
-            updateFromJSON(jsonStr);
-        }
-    }
-
 }