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

Increased period between pebble app re-starts to give it chance to send some data before being re-started.

Browse Source
This commit is contained in:
Graham Jones
2016-07-24 21:49:09 +01:00
parent 0178f249c1
commit eb6dad5e93
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
See http://openseizuredetector.org for more information. See http://openseizuredetector.org for more information.
Copyright Graham Jones, 2015. Copyright Graham Jones, 2015, 2016
This file is part of pebble_sd. This file is part of pebble_sd.
@@ -65,6 +65,7 @@ public class SdDataSourcePebble extends SdDataSource {
// data after mDataUpdatePeriod // data after mDataUpdatePeriod
//private Looper mServiceLooper; //private Looper mServiceLooper;
private int mFaultTimerPeriod = 30; // Fault Timer Period in sec private int mFaultTimerPeriod = 30; // Fault Timer Period in sec
private int mSettingsPeriod = 60; // period between requesting settings in seconds.
private PebbleKit.PebbleDataReceiver msgDataHandler = null; private PebbleKit.PebbleDataReceiver msgDataHandler = null;
@@ -192,7 +193,7 @@ public class SdDataSourcePebble extends SdDataSource {
mUtil.writeToSysLogFile("SdDataSourcePebble.mSettingsTimer timed out."); mUtil.writeToSysLogFile("SdDataSourcePebble.mSettingsTimer timed out.");
getPebbleSdSettings(); getPebbleSdSettings();
} }
}, 0, 1000 * (mDataUpdatePeriod + 60)); // ask for settings less frequently than we get data }, 0, 1000 * mSettingsPeriod); // ask for settings less frequently than we get data
} else { } else {
Log.v(TAG, "start(): settings timer already running."); Log.v(TAG, "start(): settings timer already running.");
mUtil.writeToSysLogFile("SdDataSourcePebble.start() - settings timer already running??"); mUtil.writeToSysLogFile("SdDataSourcePebble.start() - settings timer already running??");
@@ -650,13 +651,17 @@ public class SdDataSourcePebble extends SdDataSource {
(tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) { (tdiff > (mDataUpdatePeriod + mAppRestartTimeout) * 1000)) {
Log.v(TAG, "getPebbleStatus() - tdiff = " + tdiff); Log.v(TAG, "getPebbleStatus() - tdiff = " + tdiff);
mSdData.pebbleAppRunning = false; mSdData.pebbleAppRunning = false;
Log.v(TAG, "getPebbleStatus() - Pebble App Not Running - Attempting to Re-Start"); //Log.v(TAG, "getPebbleStatus() - Pebble App Not Running - Attempting to Re-Start");
mUtil.writeToSysLogFile("SdDataSourcePebble.getPebbleStatus() - Pebble App not Running - Attempting to Re-Start"); //mUtil.writeToSysLogFile("SdDataSourcePebble.getPebbleStatus() - Pebble App not Running - Attempting to Re-Start");
startWatchApp(); //startWatchApp();
//mPebbleStatusTime = tnow; // set status time to now so we do not re-start app repeatedly. //mPebbleStatusTime = tnow; // set status time to now so we do not re-start app repeatedly.
getPebbleSdSettings(); //getPebbleSdSettings();
// Only make audible warning beep if we have not received data for more than mFaultTimerPeriod seconds. // Only make audible warning beep if we have not received data for more than mFaultTimerPeriod seconds.
if (tdiff > (mDataUpdatePeriod + mFaultTimerPeriod) * 1000) { if (tdiff > (mDataUpdatePeriod + mFaultTimerPeriod) * 1000) {
Log.v(TAG, "getPebbleStatus() - Pebble App Not Running - Attempting to Re-Start");
mUtil.writeToSysLogFile("SdDataSourcePebble.getPebbleStatus() - Pebble App not Running - Attempting to Re-Start");
startWatchApp();
mPebbleStatusTime.setToNow();
mSdDataReceiver.onSdDataFault(mSdData); mSdDataReceiver.onSdDataFault(mSdData);
} else { } else {
Log.v(TAG, "getPebbleStatus() - Waiting for mFaultTimerPeriod before issuing audible warning..."); Log.v(TAG, "getPebbleStatus() - Waiting for mFaultTimerPeriod before issuing audible warning...");