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

Corrected errors in syslog that showed SdDataSource output as SdDataSourceBLE

Browse Source
This commit is contained in:
Graham Jones
2020-11-05 13:47:41 +00:00
parent f09a3ad59f
commit 561e570eb1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/uk/org/openseizuredetector/SdDataSource.java
View File

@@ -134,7 +134,7 @@ public abstract class SdDataSource {
// as we get app data. // as we get app data.
if (mStatusTimer == null) { if (mStatusTimer == null) {
Log.v(TAG, "start(): starting status timer"); Log.v(TAG, "start(): starting status timer");
mUtil.writeToSysLogFile("SdDataSourceBLE.start() - starting status timer"); mUtil.writeToSysLogFile("SdDataSource.start() - starting status timer");
mStatusTimer = new Timer(); mStatusTimer = new Timer();
mStatusTimer.schedule(new TimerTask() { mStatusTimer.schedule(new TimerTask() {
@Override @Override
@@ -144,11 +144,11 @@ public abstract class SdDataSource {
}, 0, mDataUpdatePeriod * 1000); }, 0, mDataUpdatePeriod * 1000);
} else { } else {
Log.v(TAG, "start(): status timer already running."); Log.v(TAG, "start(): status timer already running.");
mUtil.writeToSysLogFile("SdDataSourceBLE.start() - status timer already running??"); mUtil.writeToSysLogFile("SdDataSource.start() - status timer already running??");
} }
if (mFaultCheckTimer == null) { if (mFaultCheckTimer == null) {
Log.v(TAG, "start(): starting alarm check timer"); Log.v(TAG, "start(): starting alarm check timer");
mUtil.writeToSysLogFile("SdDataSourceBLE.start() - starting alarm check timer"); mUtil.writeToSysLogFile("SdDataSource.start() - starting alarm check timer");
mFaultCheckTimer = new Timer(); mFaultCheckTimer = new Timer();
mFaultCheckTimer.schedule(new TimerTask() { mFaultCheckTimer.schedule(new TimerTask() {
@Override @Override
@@ -158,12 +158,12 @@ public abstract class SdDataSource {
}, 0, 1000); }, 0, 1000);
} else { } else {
Log.v(TAG, "start(): alarm check timer already running."); Log.v(TAG, "start(): alarm check timer already running.");
mUtil.writeToSysLogFile("SDDataSourceBLE.start() - alarm check timer already running??"); mUtil.writeToSysLogFile("SDDataSource.start() - alarm check timer already running??");
} }
if (mSettingsTimer == null) { if (mSettingsTimer == null) {
Log.v(TAG, "start(): starting settings timer"); Log.v(TAG, "start(): starting settings timer");
mUtil.writeToSysLogFile("SDDataSourceBLE.start() - starting settings timer"); mUtil.writeToSysLogFile("SDDataSource.start() - starting settings timer");
mSettingsTimer = new Timer(); mSettingsTimer = new Timer();
mSettingsTimer.schedule(new TimerTask() { mSettingsTimer.schedule(new TimerTask() {
@Override @Override
@@ -173,7 +173,7 @@ public abstract class SdDataSource {
}, 0, 1000 * mSettingsPeriod); // 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("SDDataSourceBLE.start() - settings timer already running??"); mUtil.writeToSysLogFile("SDDataSource.start() - settings timer already running??");
} }
} }
@@ -187,7 +187,7 @@ public abstract class SdDataSource {
// Stop the status timer // Stop the status timer
if (mStatusTimer != null) { if (mStatusTimer != null) {
Log.v(TAG, "stop(): cancelling status timer"); Log.v(TAG, "stop(): cancelling status timer");
mUtil.writeToSysLogFile("SDDataSourceBLE.stop() - cancelling status timer"); mUtil.writeToSysLogFile("SDDataSource.stop() - cancelling status timer");
mStatusTimer.cancel(); mStatusTimer.cancel();
mStatusTimer.purge(); mStatusTimer.purge();
mStatusTimer = null; mStatusTimer = null;
@@ -195,7 +195,7 @@ public abstract class SdDataSource {
// Stop the settings timer // Stop the settings timer
if (mSettingsTimer != null) { if (mSettingsTimer != null) {
Log.v(TAG, "stop(): cancelling settings timer"); Log.v(TAG, "stop(): cancelling settings timer");
mUtil.writeToSysLogFile("SDDataSourceBLE.stop() - cancelling settings timer"); mUtil.writeToSysLogFile("SDDataSource.stop() - cancelling settings timer");
mSettingsTimer.cancel(); mSettingsTimer.cancel();
mSettingsTimer.purge(); mSettingsTimer.purge();
mSettingsTimer = null; mSettingsTimer = null;
@@ -203,7 +203,7 @@ public abstract class SdDataSource {
// Stop the alarm check timer // Stop the alarm check timer
if (mFaultCheckTimer != null) { if (mFaultCheckTimer != null) {
Log.v(TAG, "stop(): cancelling alarm check timer"); Log.v(TAG, "stop(): cancelling alarm check timer");
mUtil.writeToSysLogFile("SDDataSourceBLE.stop() - cancelling alarm check timer"); mUtil.writeToSysLogFile("SDDataSource.stop() - cancelling alarm check timer");
mFaultCheckTimer.cancel(); mFaultCheckTimer.cancel();
mFaultCheckTimer.purge(); mFaultCheckTimer.purge();
mFaultCheckTimer = null; mFaultCheckTimer = null;
@@ -211,7 +211,7 @@ public abstract class SdDataSource {
} catch (Exception e) { } catch (Exception e) {
Log.v(TAG, "Error in stop() - " + e.toString()); Log.v(TAG, "Error in stop() - " + e.toString());
mUtil.writeToSysLogFile("SDDataSourceBLE.stop() - error - "+e.toString()); mUtil.writeToSysLogFile("SDDataSource.stop() - error - "+e.toString());
} }
} }
@@ -289,7 +289,7 @@ public abstract class SdDataSource {
mSampleFreq = (short)dataObject.getInt("sampleFreq"); mSampleFreq = (short)dataObject.getInt("sampleFreq");
mSdData.batteryPc = (short)dataObject.getInt("battery"); mSdData.batteryPc = (short)dataObject.getInt("battery");
Log.v(TAG,"updateFromJSON - mSamplePeriod="+mSamplePeriod+" mSampleFreq="+mSampleFreq); Log.v(TAG,"updateFromJSON - mSamplePeriod="+mSamplePeriod+" mSampleFreq="+mSampleFreq);
mUtil.writeToSysLogFile("SDDataSourceBLE.updateFromJSON - Settings Received"); mUtil.writeToSysLogFile("SDDataSource.updateFromJSON - Settings Received");
mUtil.writeToSysLogFile(" * mSamplePeriod="+mSamplePeriod+" mSampleFreq="+mSampleFreq); mUtil.writeToSysLogFile(" * mSamplePeriod="+mSamplePeriod+" mSampleFreq="+mSampleFreq);
mUtil.writeToSysLogFile(" * batteryPc = "+mSdData.batteryPc); mUtil.writeToSysLogFile(" * batteryPc = "+mSdData.batteryPc);
@@ -315,7 +315,7 @@ public abstract class SdDataSource {
retVal = "ERROR"; retVal = "ERROR";
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG,"updateFromJSON - Error Parsing JSON String - "+e.toString()); Log.e(TAG,"updateFromJSON - Error Parsing JSON String - "+ jsonStr+" - "+e.toString());
mUtil.writeToSysLogFile("updateFromJSON - Error Parsing JSON String - "+e.toString()); mUtil.writeToSysLogFile("updateFromJSON - Error Parsing JSON String - "+e.toString());
e.printStackTrace(); e.printStackTrace();
retVal = "ERROR"; retVal = "ERROR";