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

Added fault timer to avoid warning beeps for short term glitches in connection.

Browse Source
This commit is contained in:
Graham Jones
2015-12-23 21:24:31 +00:00
parent 05af94cf93
commit 13a9c10211
1 changed files with 112 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -65,7 +65,6 @@ import org.json.JSONObject;
import org.json.JSONArray; import org.json.JSONArray;
/** /**
* Based on example at: * Based on example at:
* http://stackoverflow.com/questions/14309256/using-nanohttpd-in-android * http://stackoverflow.com/questions/14309256/using-nanohttpd-in-android
@@ -84,6 +83,10 @@ public class SdServer extends Service implements SdDataReceiver {
private CancelAudibleTimer mCancelAudibleTimer = null; private CancelAudibleTimer mCancelAudibleTimer = null;
private int mCancelAudiblePeriod = 10; // Cancel Audible Period in minutes private int mCancelAudiblePeriod = 10; // Cancel Audible Period in minutes
private long mCancelAudibleTimeRemaining = 0; private long mCancelAudibleTimeRemaining = 0;
private FaultTimer mFaultTimer = null;
private int mFaultTimerPeriod = 30; // Fault Timer Period in sec
private boolean mFaultTimerCompleted = false;
private HandlerThread thread; private HandlerThread thread;
private WakeLock mWakeLock = null; private WakeLock mWakeLock = null;
public SdDataSource mSdDataSource; public SdDataSource mSdDataSource;
@@ -163,12 +166,12 @@ public class SdServer extends Service implements SdDataReceiver {
Log.v(TAG, "onStartCommand: Datasource =" + mSdDataSourceName); Log.v(TAG, "onStartCommand: Datasource =" + mSdDataSourceName);
switch (mSdDataSourceName) { switch (mSdDataSourceName) {
case "Pebble": case "Pebble":
Log.v(TAG,"Selecting Pebble DataSource"); Log.v(TAG, "Selecting Pebble DataSource");
mSdDataSource = new SdDataSourcePebble(this.getApplicationContext(), this); mSdDataSource = new SdDataSourcePebble(this.getApplicationContext(), this);
break; break;
case "Network": case "Network":
Log.v(TAG, "Selecting Network DataSource"); Log.v(TAG, "Selecting Network DataSource");
mSdDataSource = new SdDataSourceNetwork(this.getApplicationContext(),this); mSdDataSource = new SdDataSourceNetwork(this.getApplicationContext(), this);
break; break;
default: default:
Log.v(TAG, "Datasource " + mSdDataSourceName + " not recognised - Exiting"); Log.v(TAG, "Datasource " + mSdDataSourceName + " not recognised - Exiting");
@@ -188,7 +191,6 @@ public class SdServer extends Service implements SdDataReceiver {
mSMSTime = new Time(Time.getCurrentTimezone()); mSMSTime = new Time(Time.getCurrentTimezone());
// Start timer to log data regularly.. // Start timer to log data regularly..
if (dataLogTimer == null) { if (dataLogTimer == null) {
Log.v(TAG, "onCreate(): starting dataLog timer"); Log.v(TAG, "onCreate(): starting dataLog timer");
@@ -235,16 +237,16 @@ public class SdServer extends Service implements SdDataReceiver {
Log.d(TAG, "mmm...mWakeLock is null, so not releasing lock. This shouldn't happen!"); Log.d(TAG, "mmm...mWakeLock is null, so not releasing lock. This shouldn't happen!");
} }
if (mSdDataSource!=null) { if (mSdDataSource != null) {
Log.v(TAG,"stopping mSdDataSource"); Log.v(TAG, "stopping mSdDataSource");
mSdDataSource.stop(); mSdDataSource.stop();
} else { } else {
Log.e(TAG,"ERROR - mSdDataSource is null - why????"); Log.e(TAG, "ERROR - mSdDataSource is null - why????");
} }
// Stop the data update timer // Stop the data update timer
if (mCancelAudibleTimer !=null) { if (mCancelAudibleTimer != null) {
Log.v(TAG,"stop(): cancelling Cancel_Audible timer"); Log.v(TAG, "stop(): cancelling Cancel_Audible timer");
mCancelAudibleTimer.cancel(); mCancelAudibleTimer.cancel();
//mCancelAudibleTimer.purge(); //mCancelAudibleTimer.purge();
mCancelAudibleTimer = null; mCancelAudibleTimer = null;
@@ -273,9 +275,9 @@ public class SdServer extends Service implements SdDataReceiver {
*/ */
private void showNotification() { private void showNotification() {
Log.v(TAG, "showNotification()"); Log.v(TAG, "showNotification()");
Intent i = new Intent(getApplicationContext(),MainActivity.class); Intent i = new Intent(getApplicationContext(), MainActivity.class);
i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
PendingIntent contentIntent = PendingIntent.getActivity(this,0,i,PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_UPDATE_CURRENT);
NotificationCompat.Builder builder = new NotificationCompat.Builder(this); NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
Notification notification = builder.setContentIntent(contentIntent) Notification notification = builder.setContentIntent(contentIntent)
.setSmallIcon(R.drawable.star_of_life_24x24) .setSmallIcon(R.drawable.star_of_life_24x24)
@@ -292,17 +294,18 @@ public class SdServer extends Service implements SdDataReceiver {
// Show the main activity on the user's screen. // Show the main activity on the user's screen.
private void showMainActivity() { private void showMainActivity() {
Log.v(TAG, "showMainActivity()"); Log.v(TAG, "showMainActivity()");
Intent i = new Intent(getApplicationContext(),MainActivity.class); Intent i = new Intent(getApplicationContext(), MainActivity.class);
i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK); i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
this.startActivity(i); this.startActivity(i);
} }
/** /**
* Process the data received from the SdData source. * Process the data received from the SdData source.
*
* @param sdData * @param sdData
*/ */
public void onSdDataReceived(SdData sdData) { public void onSdDataReceived(SdData sdData) {
Log.v(TAG, "onSdDataReceived() - "+sdData.toString()); Log.v(TAG, "onSdDataReceived() - " + sdData.toString());
if (sdData.alarmState == 0) { if (sdData.alarmState == 0) {
if ((!mLatchAlarms) || if ((!mLatchAlarms) ||
(mLatchAlarms && (mLatchAlarms &&
@@ -388,18 +391,20 @@ public class SdServer extends Service implements SdDataReceiver {
if ((sdData.alarmState == 4)) { if ((sdData.alarmState == 4)) {
sdData.alarmPhrase = "FAULT"; sdData.alarmPhrase = "FAULT";
faultWarningBeep(); faultWarningBeep();
} else {
stopFaultTimer();
} }
mSdData = sdData; mSdData = sdData;
if (webServer!=null) webServer.setSdData(mSdData); if (webServer != null) webServer.setSdData(mSdData);
Log.v(TAG,"onSdDataReceived() - setting mSdData to "+mSdData.toString()); Log.v(TAG, "onSdDataReceived() - setting mSdData to " + mSdData.toString());
} }
// Called by SdDataSource when a fault condition is detected. // Called by SdDataSource when a fault condition is detected.
public void onSdDataFault(SdData sdData) { public void onSdDataFault(SdData sdData) {
Log.v(TAG,"onSdDataFault()"); Log.v(TAG, "onSdDataFault()");
mSdData = sdData; mSdData = sdData;
mSdData.alarmState = 4; // set fault alarm state. mSdData.alarmState = 4; // set fault alarm state.
if (webServer!=null) webServer.setSdData(mSdData); if (webServer != null) webServer.setSdData(mSdData);
if (mAudibleFaultWarning) { if (mAudibleFaultWarning) {
faultWarningBeep(); faultWarningBeep();
} }
@@ -420,16 +425,22 @@ public class SdServer extends Service implements SdDataReceiver {
* beep, provided mAudibleAlarm is set * beep, provided mAudibleAlarm is set
*/ */
public void faultWarningBeep() { public void faultWarningBeep() {
if (mCancelAudible) { if (mFaultTimerCompleted) {
Log.v(TAG, "faultWarningBeep() - CancelAudible Active - silent beep..."); if (mCancelAudible) {
} else { Log.v(TAG, "faultWarningBeep() - CancelAudible Active - silent beep...");
if (mAudibleFaultWarning) {
beep(10);
Log.v(TAG, "faultWarningBeep()");
} else { } else {
Log.v(TAG, "faultWarningBeep() - silent..."); if (mAudibleFaultWarning) {
beep(10);
Log.v(TAG, "faultWarningBeep()");
} else {
Log.v(TAG, "faultWarningBeep() - silent...");
}
} }
} else {
startFaultTimer();
Log.v(TAG, "faultWarningBeep() - starting Fault Timer");
} }
} }
@@ -503,17 +514,17 @@ public class SdServer extends Service implements SdDataReceiver {
public void cancelAudible() { public void cancelAudible() {
// Start timer to remove the cancel audible flag // Start timer to remove the cancel audible flag
// after the required period. // after the required period.
if (mCancelAudibleTimer!=null) { if (mCancelAudibleTimer != null) {
Log.v(TAG,"onCreate(): cancel audible timer already running - cancelling it."); Log.v(TAG, "onCreate(): cancel audible timer already running - cancelling it.");
mCancelAudibleTimer.cancel(); mCancelAudibleTimer.cancel();
mCancelAudibleTimer = null; mCancelAudibleTimer = null;
mCancelAudible = false; mCancelAudible = false;
} else { } else {
Log.v(TAG,"cancelAudible(): starting cancel audible timer"); Log.v(TAG, "cancelAudible(): starting cancel audible timer");
mCancelAudible = true; mCancelAudible = true;
mCancelAudibleTimer = mCancelAudibleTimer =
// conver to ms. // conver to ms.
new CancelAudibleTimer(mCancelAudiblePeriod*60*1000,1000); new CancelAudibleTimer(mCancelAudiblePeriod * 60 * 1000, 1000);
mCancelAudibleTimer.start(); mCancelAudibleTimer.start();
} }
} }
@@ -537,7 +548,7 @@ public class SdServer extends Service implements SdDataReceiver {
protected void startWebServer() { protected void startWebServer() {
Log.v(TAG, "startWebServer()"); Log.v(TAG, "startWebServer()");
if (webServer == null) { if (webServer == null) {
webServer = new SdWebServer(getApplicationContext(),getDataStorageDir(),mSdData); webServer = new SdWebServer(getApplicationContext(), getDataStorageDir(), mSdData);
try { try {
webServer.start(); webServer.start();
} catch (IOException ioe) { } catch (IOException ioe) {
@@ -585,12 +596,23 @@ public class SdServer extends Service implements SdDataReceiver {
SharedPreferences SP = PreferenceManager SharedPreferences SP = PreferenceManager
.getDefaultSharedPreferences(getBaseContext()); .getDefaultSharedPreferences(getBaseContext());
try { try {
mSdDataSourceName = SP.getString("DataSource","undefined"); mSdDataSourceName = SP.getString("DataSource", "undefined");
Log.v(TAG,"updatePrefs() - DataSource = "+mSdDataSourceName); Log.v(TAG, "updatePrefs() - DataSource = " + mSdDataSourceName);
mLatchAlarms = SP.getBoolean("LatchAlarms", false); mLatchAlarms = SP.getBoolean("LatchAlarms", false);
Log.v(TAG, "updatePrefs() - mLatchAlarms = " + mLatchAlarms); Log.v(TAG, "updatePrefs() - mLatchAlarms = " + mLatchAlarms);
mAudibleFaultWarning = SP.getBoolean("AudibleFaultWarning", true); mAudibleFaultWarning = SP.getBoolean("AudibleFaultWarning", true);
Log.v(TAG, "updatePrefs() - mAuidbleFaultWarning = " + mAudibleFaultWarning); Log.v(TAG, "updatePrefs() - mAuidbleFaultWarning = " + mAudibleFaultWarning);
// 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(getApplicationContext(), "Problem Parsing FaultTimerPeriod Preference", Toast.LENGTH_SHORT);
toast.show();
}
mAudibleAlarm = SP.getBoolean("AudibleAlarm", true); mAudibleAlarm = SP.getBoolean("AudibleAlarm", true);
Log.v(TAG, "updatePrefs() - mAuidbleAlarm = " + mAudibleAlarm); Log.v(TAG, "updatePrefs() - mAuidbleAlarm = " + mAudibleAlarm);
mAudibleWarning = SP.getBoolean("AudibleWarning", true); mAudibleWarning = SP.getBoolean("AudibleWarning", true);
@@ -693,20 +715,76 @@ public class SdServer extends Service implements SdDataReceiver {
public CancelAudibleTimer(long startTime, long interval) { public CancelAudibleTimer(long startTime, long interval) {
super(startTime, interval); super(startTime, interval);
} }
@Override @Override
public void onFinish() { public void onFinish() {
mCancelAudible = false; mCancelAudible = false;
Log.v(TAG,"mCancelAudibleTimer - removing cancelAudible flag"); Log.v(TAG, "mCancelAudibleTimer - removing cancelAudible flag");
} }
@Override @Override
public void onTick(long msRemaining) { public void onTick(long msRemaining) {
mCancelAudibleTimeRemaining = msRemaining/1000; mCancelAudibleTimeRemaining = msRemaining / 1000;
Log.v(TAG,"mCancelAudibleTimer - onTick() - Time Remaining = " Log.v(TAG, "mCancelAudibleTimer - onTick() - Time Remaining = "
+ mCancelAudibleTimeRemaining); + mCancelAudibleTimeRemaining);
} }
} }
/**
* Start the fault timer that is used to require a fault to remain
* standing for a period before raising fault beeps.
*/
public void startFaultTimer() {
if (mFaultTimer != null) {
Log.v(TAG, "startFaultTimer(): fault timer already running - not doing anything.");
} else {
Log.v(TAG, "startFaultTimer(): starting fault timer.");
mFaultTimerCompleted = false;
mFaultTimer =
// conver to ms.
new FaultTimer(mFaultTimerPeriod * 1000, 1000);
mFaultTimer.start();
}
}
public void stopFaultTimer() {
if (mFaultTimer != null) {
Log.v(TAG, "stopFaultTimer(): fault timer already running - cancelling it.");
mFaultTimer.cancel();
mFaultTimer = null;
mFaultTimerCompleted = false;
} else {
Log.v(TAG, "stopFaultTimer(): fault timer not running - not doing anything.");
}
}
/**
* Inhibit fault alarm initiation for a period to avoid spurious warning
* beeps caused by short term network interruptions.
*/
private class FaultTimer extends CountDownTimer {
public long mFaultTimerRemaining = 0;
public FaultTimer(long startTime, long interval) {
super(startTime, interval);
}
@Override
public void onFinish() {
mFaultTimerCompleted = true;
Log.v(TAG, "mFaultTimer - removing mFaultTimerRunning flag");
}
@Override
public void onTick(long msRemaining) {
mFaultTimerRemaining = msRemaining / 1000;
Log.v(TAG, "mFaultTimer - onTick() - Time Remaining = "
+ mFaultTimerRemaining);
}
}
} }