V4.0.4 - Added data source name to event data, tidied upgrade changelog text.

This commit is contained in:
Graham Jones
2022-04-14 11:03:24 +01:00
parent 9148da0597
commit 9d0db26cd6
8 changed files with 5 additions and 6 deletions

View File

@@ -72,6 +72,7 @@ public class SdData implements Parcelable {
public double mO2SatThreshMin = 80.0;
/* Watch App Settings */
public String dataSourceName = "";
public String watchPartNo = "";
public String watchFwVersion = "";
public String watchSdVersion = "";
@@ -242,6 +243,7 @@ public class SdData implements Parcelable {
jsonObj.put("o2SatAlarmActive", mO2SatAlarmActive);
jsonObj.put("o2SatAlarmStanding", mO2SatAlarmStanding);
jsonObj.put("o2SatThreshMin", mO2SatThreshMin);
jsonObj.put("dataSourceName", dataSourceName);
jsonObj.put("watchPartNo", watchPartNo);
jsonObj.put("watchSdName", watchSdName);
jsonObj.put("watchFwVersion", watchFwVersion);

View File

@@ -228,6 +228,7 @@ public class SdServer extends Service implements SdDataReceiver {
updatePrefs();
Log.v(TAG, "onStartCommand: Datasource =" + mSdDataSourceName);
mSdData.dataSourceName = mSdDataSourceName;
switch (mSdDataSourceName) {
case "Pebble":
Log.v(TAG, "Selecting Pebble DataSource");